From 5e852d723644703c86b1c0c765926ac633ae7959 Mon Sep 17 00:00:00 2001
From: James Antill <james@fedoraproject.org>
Date: Jan 06 2009 20:05:07 +0000
Subject: - Fix distutils generated rpms.

- Resolves: bug#236535

---

diff --git a/python-2.6-distutils_rpm.patch b/python-2.6-distutils_rpm.patch
new file mode 100644
index 0000000..296bdaf
--- /dev/null
+++ b/python-2.6-distutils_rpm.patch
@@ -0,0 +1,12 @@
+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~
diff --git a/python.spec b/python.spec
index 7c639bd..1283d3a 100644
--- a/python.spec
+++ b/python.spec
@@ -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 @@ Patch14: python-2.5.1-socketmodule-constants2.patch
 #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 @@ code that uses more than just unittest and/or test_support.py.
 #%%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 @@ rm -fr $RPM_BUILD_ROOT
 %{_libdir}/python%{pybasever}/lib-dynload/_testcapimodule.so
 
 %changelog
+* Tue Jan  6 2009 James Antill <james.antill@redhat.com> - 2.6-3
+- Fix distutils generated rpms.
+- Resolves: bug#236535
+
 * Wed Dec 10 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.6-2
 - Enable -lcrypt for cryptmodule
 
 * Fri Nov 28 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 2.6-1
 - Update to 2.6
 
-* Tue Sep 30 2008 James Antill <katzj@redhat.com> - 2.5.2-1
+* Tue Sep 30 2008 James Antill <james.antill@redhat.com> - 2.5.2-1
 - Move to 2.5.2
 - Fix CVE-2008-2316 hashlib overflow.