From b30310c6db332e1e4e953b3137810d617ceced49 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@fedoraproject.org>
Date: Mon, 15 Jun 2009 21:52:11 +0000
Subject: [PATCH] - New upstream release 1.0.46. - Enable experimental supermin
 appliance build.

---
 .cvsignore      |  2 +-
 libguestfs.spec | 27 +++++++++++++++++++++++----
 sources         |  2 +-
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 61aa779..7fbcbad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libguestfs-1.0.45.tar.gz
+libguestfs-1.0.46.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index d04936a..ba96976 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -3,8 +3,8 @@
 
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
-Version:     1.0.45
-Release:     2%{?dist}
+Version:     1.0.46
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -26,8 +26,7 @@ BuildRequires: glibc-static
 # 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)
+# Build requirements for the appliance (see 'make.sh.in' in the source):
 BuildRequires: kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
 BuildRequires: MAKEDEV, net-tools, augeas-libs, file
 BuildRequires: module-init-tools, procps, strace, iputils
@@ -36,6 +35,15 @@ BuildRequires: dosfstools, zerofree
 BuildRequires: grub, ntfsprogs
 %endif
 
+# Must match the above set of BuildRequires exactly!
+Requires:      kernel, bash, coreutils, lvm2, ntfs-3g, util-linux-ng
+Requires:      MAKEDEV, net-tools, augeas-libs, file
+Requires:      module-init-tools, procps, strace, iputils
+Requires:      dosfstools, zerofree
+%ifarch %{ix86} x86_64
+Requires:      grub, ntfsprogs
+%endif
+
 # These are only required if you want to build the bindings for
 # different languages:
 BuildRequires: ocaml
@@ -262,6 +270,7 @@ createrepo repo
   --mandir=%{_mandir} \
   --with-qemu="qemu-kvm qemu-system-%{_build_arch} qemu" \
   --enable-debug-command \
+  --enable-supermin \
   %{extra}
 
 # This ensures that /usr/sbin/chroot is on the path.  Not needed
@@ -319,6 +328,11 @@ rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+# Delete the ordinary appliance, leaving just the supermin appliance.
+rm $RPM_BUILD_ROOT%{_libdir}/vmlinuz.*
+rm $RPM_BUILD_ROOT%{_libdir}/initramfs.*.img
+
+# Delete static libraries, libtool files.
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.a
 rm $RPM_BUILD_ROOT%{_libdir}/libguestfs.la
 
@@ -381,6 +395,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
+%{_bindir}/guestfs-supermin-helper
 %{_libdir}/guestfs/
 %{_libdir}/libguestfs.so.*
 
@@ -474,6 +489,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 15 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.46-1
+- New upstream release 1.0.46.
+- Enable experimental supermin appliance build.
+
 * Fri Jun 12 2009 Richard W.M. Jones <rjones@redhat.com> - 1.0.45-2
 - New upstream release 1.0.45.
 
diff --git a/sources b/sources
index 48cb20b..4c566dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54f3604e079dd6be6385bd73fe83b980  libguestfs-1.0.45.tar.gz
+5e193c464ae6830924675ce620f07f31  libguestfs-1.0.46.tar.gz