From a1ae78b8d335beb4cf9e44b6a17501b93d956865 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 9 May 2011 16:32:52 +0100 Subject: [PATCH] configure: Use Python platform-dependent site-packages. --- ...thon-platform-dependent-site-package.patch | 26 +++++++++++++++++++ libguestfs.spec | 11 +++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-configure-Use-Python-platform-dependent-site-package.patch diff --git a/0001-configure-Use-Python-platform-dependent-site-package.patch b/0001-configure-Use-Python-platform-dependent-site-package.patch new file mode 100644 index 0000000..13c1954 --- /dev/null +++ b/0001-configure-Use-Python-platform-dependent-site-package.patch @@ -0,0 +1,26 @@ +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 b8cb127..4f52d06 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -30,7 +30,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.11.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries URL: http://libguestfs.org/ @@ -40,6 +40,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 +# 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 @@ -434,6 +438,8 @@ php-%{name} contains PHP bindings for %{name}. %setup -q %patch0 -p1 +%patch1 -p1 +autoconf mkdir -p daemon/m4 @@ -772,6 +778,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 9 2011 Richard W.M. Jones - 1:1.11.5-2 +- configure: Use Python platform-dependent site-packages. + * Mon May 9 2011 Richard W.M. Jones - 1:1.11.5-1 - New upstream version 1.11.5. - virt-edit has been rewritten in C, therefore this tool has been moved