rpms/python/devel python-2.6-distutils_rpm.patch, NONE, 1.1 python.spec, 1.139, 1.140

[James Antill]

Author: james

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

Modified Files:
	python.spec 
Added Files:
	python-2.6-distutils_rpm.patch 
Log Message:
* Tue Jan  6 2009 James Antill <james.antill at redhat.com> - 2.6-3
- Fix distutils generated rpms.
- Resolves: bug#236535


python-2.6-distutils_rpm.patch:

--- NEW FILE python-2.6-distutils_rpm.patch ---
diff -ru Python-2.6-orig/Lib/distutils/command/bdist_rpm.py Python-2.6/Lib/distutils/command/bdist_rpm.py
--- Python-2.6-orig/Lib/distutils/command/bdist_rpm.py	2008-02-23 12:40:11.000000000 -0500
+++ Python-2.6/Lib/distutils/command/bdist_rpm.py	2009-01-06 15:02:18.000000000 -0500
@@ -493,6 +493,7 @@
             ('build', 'build_script', def_build),
             ('install', 'install_script',
              ("%s install "
+              "-O1 "
               "--root=$RPM_BUILD_ROOT "
               "--record=INSTALLED_FILES") % def_setup_call),
             ('clean', 'clean_script', "rm -rf $RPM_BUILD_ROOT"),
Only in Python-2.6/Lib/distutils/command: bdist_rpm.py~


Index: python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python/devel/python.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- python.spec	10 Dec 2008 20:16:00 -0000	1.139
+++ python.spec	6 Jan 2009 20:05:07 -0000	1.140
@@ -22,7 +22,7 @@
 Summary: An interpreted, interactive, object-oriented programming language
 Name: %{python}
 Version: 2.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Python
 Group: Development/Languages
 Provides: python-abi = %{pybasever}
@@ -47,6 +47,9 @@
 #Patch15: python-2.5.1-listdir.patch
 Patch16: python-2.6-rpath.patch
 
+# Fix distutils to follow the Fedora/RHEL/CentOS policies of having .pyo files
+Patch51: python-2.6-distutils_rpm.patch
+
 # upstreamed
 
 #Patch50: python-2.5-disable-egginfo.patch
@@ -216,6 +219,8 @@
 #%%patch15 -p1 -b .listdir
 %patch16 -p1 -b .rpath
 
+%patch51 -p1 -b .brprpm
+
 %ifarch alpha ia64
 # 64bit, but not lib64 arches need this too...
 %patch101 -p1 -b .lib64-regex
@@ -519,13 +524,17 @@
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Tue Jan  6 2009 James Antill <james.antill at redhat.com> - 2.6-3
+- Fix distutils generated rpms.
+- Resolves: bug#236535
+
 * Wed Dec 10 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6-2
 - Enable -lcrypt for cryptmodule
 
 * Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6-1
 - Update to 2.6
 
-* Tue Sep 30 2008 James Antill <katzj at redhat.com> - 2.5.2-1
+* Tue Sep 30 2008 James Antill <james.antill at redhat.com> - 2.5.2-1
 - Move to 2.5.2
 - Fix CVE-2008-2316 hashlib overflow.