X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs.spec.in;h=c7d36ba65d812ff3a7a886c91e4de1f62f2177c1;hb=bfa4d217f09c00d574e1cf9266281ce15f2c9f1e;hp=fd83769a31a69d073c13a4719432ba5ddbc76310;hpb=54dd7be5855055a698291084c0074a1abac7b921;p=libguestfs.git

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index fd83769..c7d36ba 100644
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -26,6 +26,10 @@ BuildRequires: readline-devel
 BuildRequires: qemu >= 0.10-7
 BuildRequires: createrepo
 
+# This is only needed for RHEL 5 because readline-devel doesn't
+# properly depend on it, but doesn't do any harm on other platforms:
+BuildRequires: ncurses-devel
+
 # Build requirements for the appliance:
 # (see 'make-initramfs.sh.in' in the source)
 BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
@@ -48,6 +52,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 +98,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 +120,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
@@ -218,10 +242,8 @@ Requires:    jpackage-utils
 %build
 %if %{buildnonet}
 mkdir repo
-pushd repo
-cp $(find /var/cache/yum/build -name '*.rpm') .
-createrepo .
-popd
+find /var/cache/yum/build -type f -name '*.rpm' -print0 | xargs -0 cp -t repo
+createrepo repo
 %define extra --with-mirror=file://$(pwd)/repo --with-repo=fedora-12
 %else
 %define extra %nil
@@ -229,14 +251,19 @@ popd
 
 ./configure \
   --prefix=%{_prefix} --libdir=%{_libdir} \
+  --mandir=%{_mandir} \
   --with-java-home=%{java_home} \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
+  --enable-debug-command \
   %{extra}
 
+# This ensures that /usr/sbin/chroot is on the path.  Not needed
+# except for RHEL 5, it shouldn't do any harm on other platforms.
+export PATH=/usr/sbin:$PATH
+
 # 'INSTALLDIRS' ensures that perl libs are installed in the vendor dir
 # not the site dir.
-# Uses javac which is incompatible with parallel make.
-make INSTALLDIRS=vendor
+make INSTALLDIRS=vendor %{?_smp_mflags}
 
 
 %check
@@ -313,22 +340,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
@@ -393,9 +427,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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.