diff --git a/.gitignore b/.gitignore index 16fc35d..b7e47b7 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.9.18.tar.gz /libguestfs-1.11.0.tar.gz /libguestfs-1.11.1.tar.gz +/libguestfs-1.11.2.tar.gz diff --git a/0001-run-script-Don-t-depend-on-libtool-being-installed.patch b/0001-run-script-Don-t-depend-on-libtool-being-installed.patch deleted file mode 100644 index 8ae0084..0000000 --- a/0001-run-script-Don-t-depend-on-libtool-being-installed.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5d139fa8a4a7f9ff65e7b936fd7376f661c72f48 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Sat, 16 Apr 2011 15:29:58 +0100 -Subject: [PATCH] run script: Don't depend on libtool being installed. - -Also use 'exec' to run the program. ---- - run | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/run b/run -index 04152b1..7e18edc 100755 ---- a/run -+++ b/run -@@ -38,5 +38,11 @@ export LD_LIBRARY_PATH="$b/src/.libs" - export LIBGUESTFS_PATH="$b/appliance" - export PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch" - -+# Do we have libtool? If we have it then we can use it to make -+# running valgrind simpler. However don't depend on it. -+if libtool --help >/dev/null 2>&1; then -+ libtool="libtool --mode=execute" -+fi -+ - # Run the program. --libtool --mode=execute "$@" -+exec $libtool "$@" --- -1.7.4.4 - diff --git a/libguestfs.spec b/libguestfs.spec index 8fb4f5f..bb347c1 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -29,8 +29,8 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 -Version: 1.11.1 -Release: 2%{?dist} +Version: 1.11.2 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,9 +40,6 @@ 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 run depending on libtool. -Patch1: 0001-run-script-Don-t-depend-on-libtool-being-installed.patch - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text @@ -437,7 +434,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 mkdir -p daemon/m4 @@ -776,6 +772,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 18 2011 Richard W.M. Jones - 1:1.11.2-1 +- New upstream version 1.11.2. +- Fixes Python bindings when used in Python threads. +- Remove upstream patch. + * Sat Apr 16 2011 Richard W.M. Jones - 1:1.11.1-2 - New upstream version 1.11.1. - Add upstream patch so we don't depend on libtool. diff --git a/sources b/sources index 5969893..966fbae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -562ce6f9258ae96c6ee0583e24104263 libguestfs-1.11.1.tar.gz +28356c30e8493ff81b75e6094d773720 libguestfs-1.11.2.tar.gz