From 1be01b24c7bb9de0c20b1804252b87caecdd180c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sat, 15 May 2010 20:13:44 +0000 Subject: [PATCH] - New upstream version 1.3.13. - Add BUGS to documentation. - Force update of hivex dependency to 1.2.2 since it contains important registry import fixes. - Remove patch1, now upstream. --- ...ensure-ordinary-appliance-is-updated.patch | 38 ------------------- libguestfs.spec | 21 +++++----- 2 files changed, 12 insertions(+), 47 deletions(-) delete mode 100644 libguestfs-1.3.12-ensure-ordinary-appliance-is-updated.patch diff --git a/libguestfs-1.3.12-ensure-ordinary-appliance-is-updated.patch b/libguestfs-1.3.12-ensure-ordinary-appliance-is-updated.patch deleted file mode 100644 index 2dae60b..0000000 --- a/libguestfs-1.3.12-ensure-ordinary-appliance-is-updated.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur libguestfs-1.3.12/appliance/Makefile.am libguestfs-1.3.12.new/appliance/Makefile.am ---- libguestfs-1.3.12/appliance/Makefile.am 2010-05-13 18:30:37.000000000 +0100 -+++ libguestfs-1.3.12.new/appliance/Makefile.am 2010-05-14 15:44:54.941717073 +0100 -@@ -87,13 +87,13 @@ - if SUPERMIN - - supermin.d/base.img supermin.d/hostfiles: stamp-supermin --stamp-supermin: $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/initramfs/init -+stamp-supermin: $(INITRAMFSIMG) - mkdir -p supermin.d - rm -f $@ supermin.d/base.img supermin.d/hostfiles - febootstrap-to-supermin $(top_builddir)/initramfs supermin.d/base.img supermin.d/hostfiles - touch $@ - --supermin.d/daemon.img: $(top_builddir)/initramfs/sbin/guestfsd -+supermin.d/daemon.img: $(INITRAMFSIMG) - mkdir -p supermin.d - rm -f $@ $@-t - (cd $(top_builddir)/initramfs && \ -diff -ur libguestfs-1.3.12/appliance/Makefile.in libguestfs-1.3.12.new/appliance/Makefile.in ---- libguestfs-1.3.12/appliance/Makefile.in 2010-05-14 12:19:39.000000000 +0100 -+++ libguestfs-1.3.12.new/appliance/Makefile.in 2010-05-14 15:44:59.237342261 +0100 -@@ -1275,13 +1275,13 @@ - # to read the README file. - - @SUPERMIN_TRUE@supermin.d/base.img supermin.d/hostfiles: stamp-supermin --@SUPERMIN_TRUE@stamp-supermin: $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/initramfs/init -+@SUPERMIN_TRUE@stamp-supermin: $(INITRAMFSIMG) - @SUPERMIN_TRUE@ mkdir -p supermin.d - @SUPERMIN_TRUE@ rm -f $@ supermin.d/base.img supermin.d/hostfiles - @SUPERMIN_TRUE@ febootstrap-to-supermin $(top_builddir)/initramfs supermin.d/base.img supermin.d/hostfiles - @SUPERMIN_TRUE@ touch $@ - --@SUPERMIN_TRUE@supermin.d/daemon.img: $(top_builddir)/initramfs/sbin/guestfsd -+@SUPERMIN_TRUE@supermin.d/daemon.img: $(INITRAMFSIMG) - @SUPERMIN_TRUE@ mkdir -p supermin.d - @SUPERMIN_TRUE@ rm -f $@ $@-t - @SUPERMIN_TRUE@ (cd $(top_builddir)/initramfs && \ diff --git a/libguestfs.spec b/libguestfs.spec index 69e72e0..85675f1 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -41,8 +41,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.3.12 -Release: 3%{?dist} +Version: 1.3.13 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,14 +52,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.0.79-no-fuse-test.patch -# Small build fix for supermin backported from upstream. -Patch1: libguestfs-1.3.12-ensure-ordinary-appliance-is-updated.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 2.7 -BuildRequires: hivex-devel >= 1.2.1 +BuildRequires: hivex-devel >= 1.2.2 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel BuildRequires: genisoimage @@ -223,7 +220,7 @@ Requires: guestfish Requires: perl-Sys-Virt Requires: perl-String-ShellQuote Requires: perl-XML-Writer -Requires: hivex >= 1.2.1 +Requires: hivex >= 1.2.2 Requires: qemu-img # Obsolete and replace earlier packages. @@ -392,7 +389,6 @@ Requires: jpackage-utils %setup -q %patch0 -p1 -%patch1 -p1 mkdir -p daemon/m4 @@ -577,7 +573,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%doc ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css +%doc BUGS ChangeLog HACKING TODO README ex html/guestfs.3.html html/pod.css %doc installed-docs/* %{_libdir}/libguestfs.so %{_mandir}/man3/guestfs.3* @@ -695,6 +691,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 16 2010 Richard W.M. Jones - 1:1.3.13-1 +- New upstream version 1.3.13. +- Add BUGS to documentation. +- Force update of hivex dependency to 1.2.2 since it contains + important registry import fixes. +- Remove patch1, now upstream. + * Fri May 14 2010 Richard W.M. Jones - 1:1.3.12-3 - Backport supermin build fix from upstream. - Further changes required for new layout of supermin appliance.