diff --git a/.gitignore b/.gitignore index 322cacd..86f1523 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ libguestfs-1.5.3.tar.gz /libguestfs-1.11.3.tar.gz /libguestfs-1.11.4.tar.gz /libguestfs-1.11.5.tar.gz +/libguestfs-1.11.7.tar.gz diff --git a/0001-configure-Use-Python-platform-dependent-site-package.patch b/0001-configure-Use-Python-platform-dependent-site-package.patch deleted file mode 100644 index 13c1954..0000000 --- a/0001-configure-Use-Python-platform-dependent-site-package.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 03a8e3fc8eba11abb47a9f6f627b8d49076b1049 Mon Sep 17 00:00:00 2001 -From: Richard W.M. Jones -Date: Mon, 9 May 2011 16:30:30 +0100 -Subject: [PATCH] configure: Use Python platform-dependent site-packages. - -This updates commit c446e6e26e317e105870b0ab25fb082887e23bf6. ---- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a746256..c8e5642 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -558,7 +558,7 @@ AS_IF([test "x$enable_python" != "xno"], - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_INSTALLDIR"; then - PYTHON_INSTALLDIR=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_lib(0,0));"` -+ print (distutils.sysconfig.get_python_lib(1,0));"` - fi - AC_MSG_RESULT([$PYTHON_INSTALLDIR]) - fi --- -1.7.5 - diff --git a/libguestfs.spec b/libguestfs.spec index 4f52d06..a7ed5e4 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.5 -Release: 2%{?dist} +Version: 1.11.7 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,15 +40,11 @@ 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 -# configure: Use Python platform-dependent site-packages. -Patch1: 0001-configure-Use-Python-platform-dependent-site-package.patch -BuildRequires: autoconf, automake, libtool, gettext - # Basic build requirements: BuildRequires: /usr/bin/pod2man BuildRequires: /usr/bin/pod2text BuildRequires: febootstrap >= 3.3 -BuildRequires: hivex-devel >= 1.2.2 +BuildRequires: hivex-devel >= 1.2.7 BuildRequires: augeas-devel >= 0.5.0 BuildRequires: readline-devel BuildRequires: genisoimage @@ -438,8 +434,6 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 -%patch1 -p1 -autoconf mkdir -p daemon/m4 @@ -778,6 +772,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 17 2011 Richard W.M. Jones - 1:1.11.7-1 +- New upstream version 1.11.7. +- Depends on hivex >= 1.2.7. +- Remove upstream patch. + * Mon May 9 2011 Richard W.M. Jones - 1:1.11.5-2 - configure: Use Python platform-dependent site-packages. diff --git a/sources b/sources index 9e0f960..d5d05b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03ccbf2f7dd52274277b52a16e53b1d3 libguestfs-1.11.5.tar.gz +befcedbe37581424650d613c8dc11db7 libguestfs-1.11.7.tar.gz