- up to 3.3.0; patches updated; needs buildfix

diff --git a/bsddb-version.patch b/bsddb-version.patch
deleted file mode 100644 (file)
index 966b089..0000000
--- a/bsddb-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -770,7 +770,7 @@
-         # a release.  Most open source OSes come with one or more
-         # versions of BerkeleyDB already installed.
- 
--        max_db_ver = (5, 1)
-+        max_db_ver = (5, 3)
-         min_db_ver = (3, 3)
-         db_setup_debug = False   # verbose debug prints from this script?
- 

diff --git a/python3-ac_fixes.patch b/python3-ac_fixes.patch
index 7e04e8029a68d912b7bfddc04a806979b530c62a..a7f553076288693b54469fcae658e8a4b08d58de 100644 (file)
--- a/python3-ac_fixes.patch
+++ b/python3-ac_fixes.patch
@@ -1,5 +1,5 @@
---- Python-3.2b1/configure.in.orig     2010-12-12 16:18:42.000000000 +0000
-+++ Python-3.2b1/configure.in  2010-12-12 16:20:34.000000000 +0000
+--- Python-3.2b1/configure.ac.orig     2010-12-12 16:18:42.000000000 +0000
++++ Python-3.2b1/configure.ac  2010-12-12 16:20:34.000000000 +0000
 @@ -879,13 +879,13 @@
            if test "$Py_DEBUG" = 'true' ; then
                # Optimization messes up debuggers, so turn it off for

diff --git a/python3-build.patch b/python3-build.patch
new file mode 100644 (file)
index 0000000..30a2a93
--- /dev/null
+++ b/python3-build.patch
@@ -0,0 +1,12 @@
+--- Python-3.3.0/Objects/obmalloc.c~   2012-09-29 10:00:46.000000000 +0200
++++ Python-3.3.0/Objects/obmalloc.c    2012-09-29 23:33:43.775178451 +0200
+@@ -1846,7 +1846,9 @@
+ 
+             if (p->ref.count == 0) {
+                 /* currently unused */
++#ifdef Py_DEBUG
+                 assert(pool_is_in_list(p, arenas[i].freepools));
++#endif
+                 continue;
+             }
+             ++numpools[sz];

diff --git a/python3-lib64.patch b/python3-lib64.patch
index 13caf623ff844d8760b454973e21b8654b562e18..6f0cc6f0c7d65351da1d8d1e6344761c97e14adb 100644 (file)
--- a/python3-lib64.patch
+++ b/python3-lib64.patch
@@ -1,6 +1,6 @@
-diff -Nur Python-3.2.1.orig//configure.in Python-3.2.1/configure.in
---- Python-3.2.1.orig//configure.in    2011-07-09 07:58:56.000000000 +0100
-+++ Python-3.2.1/configure.in  2011-07-12 22:20:12.000000000 +0100
+diff -Nur Python-3.2.1.orig//configure.ac Python-3.2.1/configure.ac
+--- Python-3.2.1.orig//configure.ac    2011-07-09 07:58:56.000000000 +0100
++++ Python-3.2.1/configure.ac  2011-07-12 22:20:12.000000000 +0100
 @@ -592,6 +592,41 @@
      esac;;
  esac
@@ -145,29 +145,29 @@ diff -Nur Python-3.2.1.orig//Lib/sysconfig.py Python-3.2.1/Lib/sysconfig.py
  
  _INSTALL_SCHEMES = {
      'posix_prefix': {
--        'stdlib': '{base}/lib/python{py_version_short}',
+-        'stdlib': '{installed_base}/lib/python{py_version_short}',
 -        'platstdlib': '{platbase}/lib/python{py_version_short}',
-+        'stdlib': '{base}/' + sys.lib + '/python{py_version_short}',
++        'stdlib': '{installed_base}/' + sys.lib + '/python{py_version_short}',
 +        'platstdlib': '{platbase}/' + sys.lib + '/python{py_version_short}',
          'purelib': '{base}/lib/python{py_version_short}/site-packages',
 -        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
 +        'platlib': '{platbase}/' + sys.lib + '/python{py_version_short}/site-packages',
          'include':
-             '{base}/include/python{py_version_short}{abiflags}',
+             '{installed_base}/include/python{py_version_short}{abiflags}',
          'platinclude':
 @@ -33,10 +33,10 @@
          'data': '{base}',
          },
      'posix_home': {
--        'stdlib': '{base}/lib/python',
+-        'stdlib': '{installed_base}/lib/python',
 -        'platstdlib': '{base}/lib/python',
-+        'stdlib': '{base}/' + sys.lib + '/python',
-+        'platstdlib': '{base}/' + sys.lib + '/python',
++        'stdlib': '{installed_base}/' + sys.lib + '/python',
++        'platstdlib': '{base}/' + sys.lib + ' /python',
          'purelib': '{base}/lib/python',
 -        'platlib': '{base}/lib/python',
 +        'platlib': '{base}/' + sys.lib + '/python',
-         'include': '{base}/include/python',
-         'platinclude': '{base}/include/python',
+         'include': '{installed_base}/include/python',
+         'platinclude': '{installed_base}/include/python',
          'scripts': '{base}/bin',
 diff -Nur Python-3.2.1.orig//Makefile.pre.in Python-3.2.1/Makefile.pre.in
 --- Python-3.2.1.orig//Makefile.pre.in 2011-07-09 07:58:52.000000000 +0100
@@ -275,20 +275,15 @@ diff -Nur Python-3.2.1.orig//Python/sysmodule.c Python-3.2.1/Python/sysmodule.c
 diff -Nur Python-3.2.1.orig//setup.py Python-3.2.1/setup.py
 --- Python-3.2.1.orig//setup.py        2011-07-09 07:58:56.000000000 +0100
 +++ Python-3.2.1/setup.py      2011-07-12 22:20:12.000000000 +0100
-@@ -445,12 +445,12 @@
-             add_dir_to_list(self.compiler.include_dirs,
-                             sysconfig.get_config_var("INCLUDEDIR"))
- 
-+        libname = sys.lib
-         # lib_dirs and inc_dirs are used to search for files;
-         # if a file is found in one of those directories, it can
+@@ -516,8 +516,7 @@
          # be assumed that no additional -I,-L directives are needed.
-         lib_dirs = self.compiler.library_dirs + [
--            '/lib64', '/usr/lib64',
--            '/lib', '/usr/lib',
-+            libname, '/usr/'+libname
-             ]
-         inc_dirs = self.compiler.include_dirs + ['/usr/include']
+         if not cross_compiling:
+             lib_dirs = self.compiler.library_dirs + [
+-                '/lib64', '/usr/lib64',
+-                '/lib', '/usr/lib',
++                sys.lib, '/usr/' + sys.lib
+                 ]
+             inc_dirs = self.compiler.include_dirs + ['/usr/include']
          exts = []
 @@ -643,11 +643,11 @@
              elif curses_library:

diff --git a/python3-makefile-location.patch b/python3-makefile-location.patch
index d30ab31be619ccc5176e2c7d80ed1dae49b87a25..be95bba1595ea0e19533914978c76edcb4c6ab2d 100644 (file)
--- a/python3-makefile-location.patch
+++ b/python3-makefile-location.patch
@@ -1,11 +1,12 @@
 --- Python-3.2.3/Lib/distutils/sysconfig.py~   2012-05-31 10:30:41.000000000 +0200
 +++ Python-3.2.3/Lib/distutils/sysconfig.py    2012-05-31 10:31:01.624339294 +0200
-@@ -253,7 +253,7 @@
-     """Return full pathname of installed Makefile from the Python build."""
+@@ -257,7 +257,7 @@
      if python_build:
-         return os.path.join(os.path.dirname(sys.executable), "Makefile")
+         return os.path.join(_sys_home or os.path.dirname(sys.executable),
+                                                          "Makefile")
 -    lib_dir = get_python_lib(plat_specific=0, standard_lib=1)
 +    lib_dir = get_python_lib(plat_specific=1, standard_lib=1)
      config_file = 'config-{}{}'.format(get_python_version(), build_flags)
      return os.path.join(lib_dir, config_file, 'Makefile')
  
+

diff --git a/python3.spec b/python3.spec
index 10071357417dd85bc70d5985e88ea0f0ccc92e18..cef8db82c35597919f03e10e5669acddfa6ac028 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -16,7 +16,7 @@
 #   test_gdb: fails, as the gdb uses old python version
 %define                broken_tests test_httpservers test_distutils test_cmd_line test_pydoc test_telnetlib test_zlib test_gdb test_site
 
-%define py_ver         3.2
+%define py_ver         3.3
 %define py_abi         %{py_ver}mu
 %define py_prefix      %{_prefix}
 %define py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
@@ -33,13 +33,13 @@ Summary(ru.UTF-8):  Язык программирования очень высо
 Summary(tr.UTF-8):     X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):     Мова програмування дуже високого рівня з X-інтерфейсом
 Name:          python3
-Version:       %{py_ver}.3
-Release:       6
+Version:       %{py_ver}.0
+Release:       0.1
 Epoch:         1
 License:       PSF
 Group:         Applications
 Source0:       http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Source0-md5: 187564726f2c1473d301c586acc24847
+# Source0-md5: 2e7533b4009ac4adae62a7797a442e7a
 Patch0:                %{name}-pythonpath.patch
 Patch1:                %{name}-ac_fixes.patch
 Patch2:                %{name}-lib64.patch
@@ -47,7 +47,7 @@ Patch3:               %{name}-noarch_to_datadir.patch
 Patch4:                %{name}-no_cmdline_tests.patch
 Patch5:                %{name}-makefile-location.patch
 Patch6:                libc-cloexec.patch
-Patch7:                bsddb-version.patch
+Patch7:                %{name}-build.patch
 URL:           http://www.python.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: bluez-libs-devel