From 94bfe394eb3416ec51f44ad74b7f7e1cc5a8160d Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Mar 16 2010 20:28:25 +0000
Subject: - fixup distutils/unixccompiler.py to remove standard library path from

    rpath (patch 17)
- delete DOS batch files

---

diff --git a/python-2.6.4-distutils-rpath.patch b/python-2.6.4-distutils-rpath.patch
new file mode 100644
index 0000000..f156507
--- /dev/null
+++ b/python-2.6.4-distutils-rpath.patch
@@ -0,0 +1,20 @@
+diff -up Python-2.6.4/Lib/distutils/unixccompiler.py.distutils-rpath Python-2.6.4/Lib/distutils/unixccompiler.py
+--- Python-2.6.4/Lib/distutils/unixccompiler.py.distutils-rpath	2009-09-09 04:34:06.000000000 -0400
++++ Python-2.6.4/Lib/distutils/unixccompiler.py	2010-03-15 21:33:25.000000000 -0400
+@@ -142,6 +142,16 @@ class UnixCCompiler(CCompiler):
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
+ 
++    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
++        """Remove standard library path from rpath"""
++        libraries, library_dirs, runtime_library_dirs = \
++            CCompiler._fix_lib_args(self, libraries, library_dirs,
++                                    runtime_library_dirs)
++        libdir = sysconfig.get_config_var('LIBDIR')
++        if runtime_library_dirs and (libdir in runtime_library_dirs):
++            runtime_library_dirs.remove(libdir)
++        return libraries, library_dirs, runtime_library_dirs
++
+     def preprocess(self, source,
+                    output_file=None, macros=None, include_dirs=None,
+                    extra_preargs=None, extra_postargs=None):
diff --git a/python.spec b/python.spec
index 99f6021..489fb1d 100644
--- a/python.spec
+++ b/python.spec
@@ -52,7 +52,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.4
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -231,6 +231,11 @@ Patch14: python-2.5.1-socketmodule-constants2.patch
 # FIXME: is this for OSF, not Linux?
 Patch16: python-2.6-rpath.patch
 
+# Fixup distutils/unixccompiler.py to remove standard library path from rpath:
+# Adapted from Patch0 in ivazquez' python3000 specfile, removing usage of
+# super() as it's an old-style class
+Patch17: python-2.6.4-distutils-rpath.patch
+
 # Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
 Patch51: python-2.6-distutils_rpm.patch
 
@@ -472,6 +477,7 @@ rm -r Modules/zlib || exit 1
 %patch13 -p1 -b .socketmodule
 %patch14 -p1 -b .socketmodule2
 %patch16 -p1 -b .rpath
+%patch17 -p1 -b .distutils-rpath
 
 %patch51 -p1 -b .brprpm
 %patch52 -p0 -b .valgrind
@@ -953,6 +959,11 @@ rm -fr %{buildroot}
 # payload file would be unpackaged)
 
 %changelog
+* Tue Mar 16 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.4-22
+- fixup distutils/unixccompiler.py to remove standard library path from
+rpath (patch 17)
+- delete DOS batch files
+
 * Fri Mar 12 2010 David Malcolm <dmalcolm@redhat.com> - 2.6.4-21
 - add pyfuntop.stp; allow systemtap support to be disabled
 - remove trailing period from tkinter summary