diff --git a/.gitignore b/.gitignore index 0e4db02..0c73ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.7.13.tar.gz /libguestfs-1.7.14.tar.gz /libguestfs-1.7.15.tar.gz +/libguestfs-1.7.16.tar.gz diff --git a/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch b/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch deleted file mode 100644 index 667ddf0..0000000 --- a/0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 60b3c8e81124a881cd93ed66c167cac37e87c36b Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Fri, 26 Nov 2010 18:26:09 +0000 -Subject: [PATCH] libtool fix: Don't do fix if there was no -o option to libtool. - -For example if libtool is being run as 'libtool --mode=execute ...' - -This fixes commit 4cf4f2b66f850bb39c5bf29d3cd12ada9114d67e. ---- - libtool-kill-dependency_libs.sh | 13 ++++++++----- - 1 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/libtool-kill-dependency_libs.sh b/libtool-kill-dependency_libs.sh -index 1403fbe..9f17038 100755 ---- a/libtool-kill-dependency_libs.sh -+++ b/libtool-kill-dependency_libs.sh -@@ -49,9 +49,12 @@ done - # Run libtool as normal. - #echo "${args[@]}" - "${args[@]}" --mv "$output" "$output.tmp" - --# Remove dependency_libs from output. --sed "s/^dependency_libs=.*/dependency_libs=''/" < "$output.tmp" > "$output" --chmod --reference="$output.tmp" "$output" --rm "$output.tmp" -+if [ -n "$output" ]; then -+ mv "$output" "$output.tmp" -+ -+ # Remove dependency_libs from output. -+ sed "s/^dependency_libs=.*/dependency_libs=''/" < "$output.tmp" > "$output" -+ chmod --reference="$output.tmp" "$output" -+ rm "$output.tmp" -+fi --- -1.7.3.2 - diff --git a/libguestfs.spec b/libguestfs.spec index 3c9bc1a..47702e6 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.7.15 -Release: 2%{?dist} +Version: 1.7.16 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -52,13 +52,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # Disable FUSE tests, not supported in Koji at the moment. Patch0: libguestfs-1.7.13-no-fuse-test.patch -# Upstream patch to fix libtool wrapper script. -Patch1: 0001-libtool-fix-Don-t-do-fix-if-there-was-no-o-option-to.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text -BuildRequires: febootstrap >= 2.10 +BuildRequires: febootstrap >= 2.11 BuildRequires: hivex-devel >= 1.2.2 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel @@ -136,7 +133,7 @@ BuildRequires: qemu-img # Runtime requires: Requires: qemu-kvm >= 0.12 -Requires: febootstrap >= 2.10 +Requires: febootstrap >= 2.11 # For libguestfs-test-tool. Requires: genisoimage @@ -210,7 +207,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: /usr/bin/hexedit Requires: /usr/bin/less Requires: /usr/bin/man -Requires: /usr/bin/pod2text Requires: /bin/vi @@ -437,7 +433,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 mkdir -p daemon/m4 @@ -740,6 +735,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Nov 26 2010 Richard Jones - 1:1.7.16-1 +- New upstream development version 1.7.16. +- guestfish no longer requires pod2text, hence no longer requires perl. +- Require febootstrap >= 2.11. + * Fri Nov 26 2010 Richard Jones - 1:1.7.15-2 - New upstream development version 1.7.15. - Split out new libguestfs-tools-c package from libguestfs-tools. diff --git a/sources b/sources index 633c459..f9be83d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63b111cb063b01c4f5425c10cfc0df44 libguestfs-1.7.15.tar.gz +536e9cce249ccc32e9c609fdfefc7a80 libguestfs-1.7.16.tar.gz