diff --git a/00174-upstream-issue16754-so-extension.patch b/00174-upstream-issue16754-so-extension.patch deleted file mode 100644 index 4af618a..0000000 --- a/00174-upstream-issue16754-so-extension.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Python-3.3.0/Lib/distutils/sysconfig.py 2012-09-29 10:00:28.000000000 +0200 -+++ Python-3.3.0/Lib/distutils/sysconfig.py 2012-12-22 20:14:49.661337174 +0100 -@@ -228,7 +228,7 @@ def customize_compiler(compiler): - linker_exe=cc, - archiver=archiver) - -- compiler.shared_lib_extension = so_ext -+ #compiler.shared_lib_extension = so_ext - - - def get_config_h_filename(): diff --git a/00175-platform-unicode.patch b/00175-platform-unicode.patch deleted file mode 100644 index 7d847e1..0000000 --- a/00175-platform-unicode.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Python-3.3.0/Lib/platform.py -=================================================================== ---- Python-3.3.0.orig/Lib/platform.py -+++ Python-3.3.0/Lib/platform.py -@@ -331,7 +331,7 @@ def linux_distribution(distname='', vers - return _dist_try_harder(distname,version,id) - - # Read the first line -- with open('/etc/'+file, 'r') as f: -+ with open('/etc/'+file, 'r', encoding='utf-8', errors='surrogateescape') as f: - firstline = f.readline() - _distname, _version, _id = _parse_release_file(firstline) - diff --git a/00176-upstream-issue16754-so-extension.patch b/00176-upstream-issue16754-so-extension.patch new file mode 100644 index 0000000..4af618a --- /dev/null +++ b/00176-upstream-issue16754-so-extension.patch @@ -0,0 +1,11 @@ +--- Python-3.3.0/Lib/distutils/sysconfig.py 2012-09-29 10:00:28.000000000 +0200 ++++ Python-3.3.0/Lib/distutils/sysconfig.py 2012-12-22 20:14:49.661337174 +0100 +@@ -228,7 +228,7 @@ def customize_compiler(compiler): + linker_exe=cc, + archiver=archiver) + +- compiler.shared_lib_extension = so_ext ++ #compiler.shared_lib_extension = so_ext + + + def get_config_h_filename(): diff --git a/00177-platform-unicode.patch b/00177-platform-unicode.patch new file mode 100644 index 0000000..7d847e1 --- /dev/null +++ b/00177-platform-unicode.patch @@ -0,0 +1,13 @@ +Index: Python-3.3.0/Lib/platform.py +=================================================================== +--- Python-3.3.0.orig/Lib/platform.py ++++ Python-3.3.0/Lib/platform.py +@@ -331,7 +331,7 @@ def linux_distribution(distname='', vers + return _dist_try_harder(distname,version,id) + + # Read the first line +- with open('/etc/'+file, 'r') as f: ++ with open('/etc/'+file, 'r', encoding='utf-8', errors='surrogateescape') as f: + firstline = f.readline() + _distname, _version, _id = _parse_release_file(firstline) + diff --git a/python3.spec b/python3.spec index 9f3dcaa..83d11d9 100644 --- a/python3.spec +++ b/python3.spec @@ -126,7 +126,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.0 -Release: 8%{?dist} +Release: 9%{?dist} License: Python Group: Development/Languages @@ -542,18 +542,29 @@ Patch164: 00164-disable-interrupted_write-tests-on-ppc.patch # (rhbz#913732) Patch173: 00173-workaround-ENOPROTOOPT-in-bind_port.patch +# 00174 # +# Patch174: 00174-fix-for-usr-move.patch +# TODO: python3 status? + +# 00175 # +# Patch175: 00175-fix-configure-Wformat.patch +# TODO: python3 status? + +# 00176 # # Potential patch for so extensions being wrong since SOABI in upstream python3. # http://bugs.python.org/issue16754 # (rhbz#889784) # Does not affect python2 (python2 does not have compiled extensions with the # problematic information) -Patch174: 00174-upstream-issue16754-so-extension.patch +Patch176: 00176-upstream-issue16754-so-extension.patch +# 00177 # # Patch for potential unicode error when determining OS release names # http://bugs.python.org/issue17429 # (rhbz#922149) # Does not affect python2 (python2 uses a byte string so it doesn't need to decode) -Patch175: 00175-platform-unicode.patch +Patch177: 00177-platform-unicode.patch + # (New patches go here ^^^) # @@ -801,8 +812,10 @@ done #00171: TODO #00172: TODO %patch173 -p1 -%patch174 -p1 -%patch175 -p1 +#00174: TODO +#00175: TODO +%patch176 -p1 +%patch177 -p1 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there # are many differences between 2.6 and the Python 3 library. @@ -1659,6 +1672,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Mon Mar 25 2013 David Malcolm - 3.3.0-9 +- renumber patches to keep them in sync with python.spec + * Fri Mar 15 2013 Toshio Kuratomi - 3.3.0-8 - Fix error in platform.platform() when non-ascii byte strings are decoded to unicode (rhbz#922149)