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

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9cc9266..87dbcd2 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -48,6 +48,9 @@ BuildRequires: java >= 1.5.0
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 
+# For virt-inspector:
+BuildRequires: perl-Sys-Virt
+
 # Runtime requires:
 Requires:    qemu >= 0.10-7
 
@@ -91,6 +94,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
@@ -112,6 +116,22 @@ modifying virtual machine disk images from the command line and shell
 scripts.
 
 
+%package -n virt-inspector
+Summary:     Display OS version, kernel, drivers, etc in a virtual machine
+Group:       Development/Tools
+License:     GPLv2+
+Requires:    %{name} = %{version}-%{release}
+Requires:    guestfish
+Requires:    perl-Sys-Virt
+
+
+%description -n virt-inspector
+Virt-inspector examines a virtual machine and tries to determine the
+version of the OS, the kernel version, what drivers are installed,
+whether the virtual machine is fully virtualized (FV) or
+para-virtualized (PV), what applications are installed and more.
+
+
 %package -n ocaml-%{name}
 Summary:     OCaml bindings for %{name}
 Group:       Development/Libraries
@@ -230,6 +250,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 +308,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,22 +334,29 @@ 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*
 
 
+%files -n virt-inspector
+%defattr(-,root,root,-)
+%{_bindir}/virt-inspector
+%{_mandir}/man1/virt-inspector.1*
+
+
 %files -n ocaml-%{name}
 %defattr(-,root,root,-)
 %doc README
@@ -377,20 +410,29 @@ 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
+* Tue Apr 28 2009 Richard Jones <rjones@redhat.com> - @VERSION@-1
 - New upstream version @VERSION@.
 
+* Tue Apr 28 2009 Richard Jones <rjones@redhat.com> - 1.0.15-1
+- New upstream version 1.0.15.
+
+* 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.