rpms/python/devel python-2.6.4-distutils-rpath.patch, NONE, 1.1 python.spec, 1.174, 1.175

[dmalcolm]

Author: dmalcolm

Update of /cvs/pkgs/rpms/python/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8654

Modified Files:
	python.spec 
Added Files:
	python-2.6.4-distutils-rpath.patch 
Log Message:
* Tue Mar 16 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.4-23
- fixup distutils/unixccompiler.py to remove standard library path from
rpath (patch 17)
- delete DOS batch files


python-2.6.4-distutils-rpath.patch:
 unixccompiler.py |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE python-2.6.4-distutils-rpath.patch ---
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):


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -p -r1.174 -r1.175
--- python.spec	13 Mar 2010 00:06:34 -0000	1.174
+++ python.spec	16 Mar 2010 19:33:57 -0000	1.175
@@ -52,7 +52,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6.4
-Release: 22%{?dist}
+Release: 23%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -231,6 +231,11 @@ Patch14: python-2.5.1-socketmodule-const
 # 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
@@ -627,6 +633,7 @@ cp -ar Demo/* %{buildroot}%{demo_dir}
 # Get rid of crap
 find %{buildroot}/ -name "*~"|xargs rm -f
 find %{buildroot}/ -name ".cvsignore"|xargs rm -f
+find %{buildroot}/ -name "*.bat"|xargs rm -f
 find . -name "*~"|xargs rm -f
 find . -name ".cvsignore"|xargs rm -f
 #zero length
@@ -953,6 +960,11 @@ rm -fr %{buildroot}
 # payload file would be unpackaged)
 
 %changelog
+* Tue Mar 16 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.4-23
+- fixup distutils/unixccompiler.py to remove standard library path from
+rpath (patch 17)
+- delete DOS batch files
+
 * Fri Mar 12 2010 David Malcolm <dmalcolm at redhat.com> - 2.6.4-22
 - add pyfuntop.stp; allow systemtap support to be disabled
 - remove trailing period from tkinter summary