Allow selection of qemu using --with-qemu

[libguestfs.git] / libguestfs.spec.in

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9cc9266..fd83769 100644 (file)
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -230,6 +230,7 @@ popd
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
   --with-java-home=%{java_home} \
+  --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   %{extra}
 
 # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
@@ -286,6 +287,10 @@ mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
 install -p -m0644 ruby/lib/guestfs.rb $RPM_BUILD_ROOT%{ruby_sitelib}
 install -p -m0755 ruby/ext/guestfs/_guestfs.so $RPM_BUILD_ROOT%{ruby_sitearch}
 
+# Remove static-linked Java bindings.
+rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.a
+rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la
+
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
@@ -377,14 +382,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files java-devel
 %defattr(-,root,root,-)
-%doc java/
+%doc README
 %{_libdir}/libguestfs_jni*.so
 
 
-%files java
+%files javadoc
 %defattr(-,root,root,-)
 %doc README
-/usr/share/javadoc/%{name}-java-%{version}
+%{_datadir}/javadoc/%{name}-java-%{version}
 
 
 %changelog