X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=libguestfs.spec.in;h=fd83769a31a69d073c13a4719432ba5ddbc76310;hb=b837b64c74567b5291964005f691a18655396460;hp=9cc9266b5a41b609fddf16906defbe107cf82aa0;hpb=b9014d6a0da8b2b3a76c4ab51fab2773fe7480b2;p=libguestfs.git

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9cc9266..fd83769 100644
--- 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