Package: rpm
Version: 4.10.1-2.1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu raring ubuntu-patch
Dear Maintainer,
This fix addresses issues we are seeing in Ubuntu causing an FTBFS with
python and multi-arch support.
* debian/patches/fix-python-multiarch-include.patch:
Fix python multiarch include issue that causes FTBFS.
Thanks for considering the patch.
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-35-lowlatency (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru rpm-4.10.1/debian/changelog rpm-4.10.1/debian/changelog
diff -Nru rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch
--- rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch 1969-12-31 18:00:00.000000000 -0600
+++ rpm-4.10.1/debian/patches/fix-python-multiarch-include.patch 2013-01-07 14:01:47.000000000 -0600
@@ -0,0 +1,38 @@
+Description: Fix python include issues due to multiarch.
+ .
+ rpm (4.10.1-2.1ubuntu1) raring; urgency=low
+ .
+ * debian/patches/fix-python-multiarch-include.patch:
+ Fix python multiarch include issue that causes FTBFS.
+Author: Chris J Arges <chris.j.ar...@canonical.com>
+Last-Update: <2013-01-07>
+
+---
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -509,10 +509,10 @@ esac],
+
+ AS_IF([test "$enable_python" = yes],[
+ AM_PATH_PYTHON([2.6],[
+- WITH_PYTHON_INCLUDE=`${PYTHON} -c 'from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_inc())'`
++ WITH_PYTHON_INCLUDE=`python-config --includes`
+ WITH_PYTHON_SUBPACKAGE=1
+ save_CPPFLAGS="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS -I$WITH_PYTHON_INCLUDE"
++ CPPFLAGS="$CPPFLAGS $WITH_PYTHON_INCLUDE"
+ AC_CHECK_HEADER([Python.h],[],
+ [AC_MSG_ERROR([missing Python.h])
+ ])
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -4,7 +4,7 @@ EXTRA_DIST = rpm/__init__.py rpm/transac
+
+ AM_CPPFLAGS = -I$(top_builddir)/include/
+ AM_CPPFLAGS += -I$(top_srcdir)/python
+-AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@
++AM_CPPFLAGS += @WITH_PYTHON_INCLUDE@
+
+ pkgpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la
+ pkgpyexec_DATA = rpm/__init__.py rpm/transaction.py
diff -Nru rpm-4.10.1/debian/patches/series rpm-4.10.1/debian/patches/series
--- rpm-4.10.1/debian/patches/series 2013-01-05 16:53:37.000000000 -0600
+++ rpm-4.10.1/debian/patches/series 2013-01-07 14:02:21.000000000 -0600
@@ -11,3 +11,4 @@
lua-libname.patch
rpm-4.9.1.2-rpmlib-filesystem-check.patch
0001-Ensure-correct-return-code-on-malformed-signature-in.patch
+fix-python-multiarch-include.patch
