diff --git a/0001-appliance-Use-gzip-compressed-cpio-files-if-supermin.patch b/0001-appliance-Use-gzip-compressed-cpio-files-if-supermin.patch deleted file mode 100644 index e12ee34..0000000 --- a/0001-appliance-Use-gzip-compressed-cpio-files-if-supermin.patch +++ /dev/null @@ -1,99 +0,0 @@ -From ca4b4089689c0c908ee56a8021d65a79d39d803e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 28 Aug 2013 22:35:42 +0100 -Subject: [PATCH] appliance: Use gzip-compressed cpio files if supermin-helper - supports it. - -supermin-helper >= 4.1.4 has new support for compressed cpio files -(not hostfiles). Detect if this is supported, and use it. ---- - appliance/Makefile.am | 23 +++++++++++++++++------ - configure.ac | 15 +++++++++++++++ - 2 files changed, 32 insertions(+), 6 deletions(-) - -diff --git a/appliance/Makefile.am b/appliance/Makefile.am -index 54d3379..a9cc9fe 100644 ---- a/appliance/Makefile.am -+++ b/appliance/Makefile.am -@@ -35,14 +35,18 @@ superminfs_DATA = \ - supermin.d/init.img \ - supermin.d/udev-rules.img - -+if SUPERMIN_HELPER_COMPRESSED_CPIO -+GZ = .gz -+endif -+ - if ENABLE_DAEMON - superminfs_DATA += \ -- supermin.d/daemon.img -+ supermin.d/daemon.img$(GZ) - endif - - if ENABLE_APPLIANCE - superminfs_DATA += \ -- supermin.d/base.img \ -+ supermin.d/base.img$(GZ) \ - supermin.d/hostfiles - endif - -@@ -73,20 +77,27 @@ excludelist: excludelist.in Makefile - cmp -s $@ $@-t || mv $@-t $@ - rm -f $@-t - --supermin.d/base.img supermin.d/hostfiles: stamp-supermin -+supermin.d/base.img$(GZ) supermin.d/hostfiles: stamp-supermin - stamp-supermin: make.sh packagelist excludelist -- rm -f $@ supermin.d/base.img supermin.d/hostfiles -+ rm -f $@ supermin.d/base.img$(GZ) supermin.d/hostfiles - ./make.sh -+if SUPERMIN_HELPER_COMPRESSED_CPIO -+ gzip -9 supermin.d/base.img -+endif - touch $@ - --supermin.d/daemon.img: ../daemon/guestfsd guestfsd.suppressions -- rm -f $@ $@-t -+supermin.d/daemon.img$(GZ): ../daemon/guestfsd guestfsd.suppressions -+ rm -f $@ $@-t $@-tt - rm -rf tmp-d - mkdir -p tmp-d$(DAEMON_SUPERMIN_DIR) tmp-d/etc - ln ../daemon/guestfsd tmp-d$(DAEMON_SUPERMIN_DIR)/guestfsd - ln $(srcdir)/guestfsd.suppressions tmp-d/etc/guestfsd.suppressions - ( cd tmp-d && find | cpio --quiet -o -H newc ) > $@-t - rm -r tmp-d -+if SUPERMIN_HELPER_COMPRESSED_CPIO -+ gzip -9 -c $@-t > $@-tt -+ mv $@-tt $@-t -+endif - mv $@-t $@ - - supermin.d/init.img: init -diff --git a/configure.ac b/configure.ac -index 0d481a8..a85590e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -446,6 +446,21 @@ AC_CHECK_PROGS([SUPERMIN], - AC_CHECK_PROGS([SUPERMIN_HELPER], - [supermin-helper febootstrap-supermin-helper],[no]) - -+dnl supermin >= 4.1.4 supports compressed cpio images. -+AC_MSG_CHECKING([for supermin-helper version]) -+supermin_helper_version=`$SUPERMIN_HELPER --version | awk '{print $2}'` -+AC_MSG_RESULT([$supermin_helper_version]) -+AC_MSG_CHECKING([if supermin-helper supports compressed cpio images]) -+supermin_helper_version_int=`echo "$supermin_helper_version" | awk -F. '{print $1 * 1000000 + $2 * 1000 + $3}'` -+if test $supermin_helper_version_int -ge 4001004; then -+ supermin_helper_compressed_cpio=yes -+else -+ supermin_helper_compressed_cpio=yes -+fi -+AC_MSG_RESULT([$supermin_helper_compressed_cpio]) -+AM_CONDITIONAL([SUPERMIN_HELPER_COMPRESSED_CPIO], -+ [test "x$supermin_helper_compressed_cpio" = "xyes"]) -+ - dnl Pass supermin --packager-config option. - dnl - dnl Note that in febootstrap >= 3.21 / supermin >= 4.1.0, this option --- -1.8.3.1 - diff --git a/0001-javadoc-Install-javadoc-in-datadir-javadoc-libguestf.patch b/0001-javadoc-Install-javadoc-in-datadir-javadoc-libguestf.patch deleted file mode 100644 index c3c2cef..0000000 --- a/0001-javadoc-Install-javadoc-in-datadir-javadoc-libguestf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 532117de297ecedb121f20fdc122ad83482e9b48 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 28 Aug 2013 18:45:14 +0100 -Subject: [PATCH] javadoc: Install javadoc in $(datadir)/javadoc/libguestfs - (without -java-$(version)). - -Apparently this is the normal place for javadoc, and not -where we installed it before. ---- - java/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/java/Makefile.am b/java/Makefile.am -index 7cb22e9..524302f 100644 ---- a/java/Makefile.am -+++ b/java/Makefile.am -@@ -115,8 +115,8 @@ doc-stamp: $(java_sources) - touch $@ - - install-data-hook: -- mkdir -p $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION) -- cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION) -+ mkdir -p $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME) -+ cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME) - - # Tests (not comprehensive). - --- -1.8.3.1 - diff --git a/libguestfs.spec b/libguestfs.spec index 5fdaedf..3f4cfba 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -11,19 +11,14 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.23.18 -Release: 4%{?dist} +Version: 1.23.19 +Release: 1%{?dist} License: LGPLv2+ # Source and patches. URL: http://libguestfs.org/ Source0: http://libguestfs.org/download/1.23-development/%{name}-%{version}.tar.gz -# Upstream since 2013-08-28. -Patch1: 0001-javadoc-Install-javadoc-in-datadir-javadoc-libguestf.patch -Patch2: 0001-appliance-Use-gzip-compressed-cpio-files-if-supermin.patch -BuildRequires: automake, autoconf, libtool, gettext-devel - # Basic build requirements: BuildRequires: perl(Pod::Simple) BuildRequires: perl(Pod::Man) @@ -563,10 +558,6 @@ for %{name}. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -autoreconf -i - if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then # For sVirt to work, the local temporary directory we use in the # tests must be labelled the same way as /tmp. @@ -956,6 +947,10 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs %changelog +* Thu Aug 29 2013 Richard W.M. Jones - 1:1.23.19-1 +- New upstream version 1.23.19. +- Remove 2 x patches which are upstream. + * Thu Aug 29 2013 Richard W.M. Jones - 1:1.23.18-4 - Enable gzip-compressed appliance. - Note this requires supermin >= 4.1.4. diff --git a/sources b/sources index cba7d5d..3128709 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7dabced2afe5c994b00c3265efd55ef6 libguestfs-1.23.18.tar.gz +32f3b924a347a20dd1dcc524e84c12f4 libguestfs-1.23.19.tar.gz