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

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9cc9266..1830bc5 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -91,6 +91,7 @@ For Java bindings, see 'libguestfs-java-devel'.
 Summary:     Development tools and libraries for %{name}
 Group:       Development/Libraries
 Requires:    %{name} = %{version}-%{release}
+Requires:    pkgconfig
 
 
 %description devel
@@ -230,6 +231,8 @@ popd
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
   --with-java-home=%{java_home} \
+  --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
+  --enable-debug-command \
   %{extra}
 
 # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
@@ -286,6 +289,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
 
@@ -308,18 +315,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
-%doc HACKING TODO README ex html/guestfs.3.html html/pod.css
+%doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css
 %doc src/generator.ml
 %{_libdir}/libguestfs.so
 %{_mandir}/man3/guestfs.3*
 %{_includedir}/guestfs.h
 %{_includedir}/guestfs-actions.h
 %{_includedir}/guestfs-structs.h
+%{_libdir}/pkgconfig/libguestfs.pc
 
 
 %files -n guestfish
 %defattr(-,root,root,-)
-%doc html/guestfish.1.html html/pod.css
+%doc html/guestfish.1.html html/pod.css recipes/
 %{_bindir}/guestfish
 %{_mandir}/man1/guestfish.1*
 
@@ -377,20 +385,26 @@ 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
-* Mon Apr 20 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
+* Fri Apr 24 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
 - New upstream version @VERSION@.
 
+* Fri Apr 24 2009 Richard Jones <rjones@redhat.com> - 1.0.12-1
+- New upstream version 1.0.12.
+
+* Wed Apr 22 2009 Richard Jones <rjones@redhat.com> - 1.0.6-1
+- New upstream version 1.0.6.
+
 * Mon Apr 20 2009 Richard Jones <rjones@redhat.com> - 1.0.2-1
 - New upstream version 1.0.2.