Safer way to copy RPMs in no-net builds (Jim Meyering).

[libguestfs.git] / libguestfs.spec.in

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9b83b48..fa55014 100644 (file)
--- 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
 
@@ -113,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
@@ -219,10 +238,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
@@ -232,6 +249,7 @@ popd
   --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
@@ -314,7 +332,7 @@ 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*
@@ -326,11 +344,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -395,9 +419,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed Apr 22 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.