- started upgrade to ver. 3.3.1

diff --git a/python3-makefile-location.patch b/python3-makefile-location.patch
index be95bba1595ea0e19533914978c76edcb4c6ab2d..912e4cdb0d99b2d5f9d82deecb548c933c7bc065 100644 (file)
--- a/python3-makefile-location.patch
+++ b/python3-makefile-location.patch
@@ -1,12 +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
-@@ -257,7 +257,7 @@
+diff -Nur Python-3.3.1.orig/Lib/distutils/sysconfig.py Python-3.3.1/Lib/distutils/sysconfig.py
+--- Python-3.3.1.orig/Lib/distutils/sysconfig.py       2013-04-06 08:41:35.000000000 +0100
++++ Python-3.3.1/Lib/distutils/sysconfig.py    2013-04-07 19:45:29.409178359 +0100
+@@ -256,7 +256,7 @@
+     """Return full pathname of installed Makefile from the Python build."""
      if python_build:
-         return os.path.join(_sys_home or os.path.dirname(sys.executable),
-                                                          "Makefile")
+         return os.path.join(_sys_home or project_base, "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-no_cmdline_tests.patch b/python3-no_cmdline_tests.patch
index fed9ed78b7efdaf5210cf279cfcb617dfec2e5ff..ad01727cf4d706f8b2d7f6d9e9b05befa7b9680f 100644 (file)
--- a/python3-no_cmdline_tests.patch
+++ b/python3-no_cmdline_tests.patch
@@ -1,7 +1,7 @@
-diff -dur Python-3.2.1.orig/Lib/test/regrtest.py Python-3.2.1/Lib/test/regrtest.py
---- Python-3.2.1.orig/Lib/test/regrtest.py     2011-07-09 08:58:49.000000000 +0200
-+++ Python-3.2.1/Lib/test/regrtest.py  2011-07-15 15:21:06.000000000 +0200
-@@ -216,7 +216,7 @@
+diff -Nur Python-3.3.1.orig/Lib/test/regrtest.py Python-3.3.1/Lib/test/regrtest.py
+--- Python-3.3.1.orig/Lib/test/regrtest.py     2013-04-06 08:41:41.000000000 +0100
++++ Python-3.3.1/Lib/test/regrtest.py  2013-04-07 19:39:23.432490962 +0100
+@@ -243,7 +243,7 @@
  
  from test import support
  
@@ -10,9 +10,9 @@ diff -dur Python-3.2.1.orig/Lib/test/regrtest.py Python-3.2.1/Lib/test/regrtest.
                    'decimal', 'cpu', 'subprocess', 'urlfetch', 'gui')
  
  TEMPDIR = os.path.abspath(tempfile.gettempdir())
-diff -dur Python-3.2.1.orig/Lib/test/test_compileall.py Python-3.2.1/Lib/test/test_compileall.py
---- Python-3.2.1.orig/Lib/test/test_compileall.py      2011-07-09 08:58:50.000000000 +0200
-+++ Python-3.2.1/Lib/test/test_compileall.py   2011-07-15 15:21:06.000000000 +0200
+diff -Nur Python-3.3.1.orig/Lib/test/test_compileall.py Python-3.3.1/Lib/test/test_compileall.py
+--- Python-3.3.1.orig/Lib/test/test_compileall.py      2013-04-06 08:41:41.000000000 +0100
++++ Python-3.3.1/Lib/test/test_compileall.py   2013-04-07 19:39:23.449157629 +0100
 @@ -130,7 +130,7 @@
          finally:
              sys.stdout = orig_stdout
@@ -22,10 +22,10 @@ diff -dur Python-3.2.1.orig/Lib/test/test_compileall.py Python-3.2.1/Lib/test/te
  class CommandLineTests(unittest.TestCase):
      """Test compileall's CLI."""
  
-diff -dur Python-3.2.1.orig/Lib/test/test_warnings.py Python-3.2.1/Lib/test/test_warnings.py
---- Python-3.2.1.orig/Lib/test/test_warnings.py        2011-07-09 08:58:51.000000000 +0200
-+++ Python-3.2.1/Lib/test/test_warnings.py     2011-07-15 15:21:06.000000000 +0200
-@@ -715,6 +715,7 @@
+diff -Nur Python-3.3.1.orig/Lib/test/test_warnings.py Python-3.3.1/Lib/test/test_warnings.py
+--- Python-3.3.1.orig/Lib/test/test_warnings.py        2013-04-06 08:41:46.000000000 +0100
++++ Python-3.3.1/Lib/test/test_warnings.py     2013-04-07 19:41:25.529164545 +0100
+@@ -717,6 +717,7 @@
      module = py_warnings
  
  
@@ -33,16 +33,16 @@ diff -dur Python-3.2.1.orig/Lib/test/test_warnings.py Python-3.2.1/Lib/test/test
  class EnvironmentVariableTests(BaseTest):
  
      def test_single_warning(self):
-@@ -760,14 +761,17 @@
+@@ -762,14 +763,17 @@
                  "['ignore:DeprecaciónWarning']".encode('utf-8'))
          self.assertEqual(p.wait(), 0)
  
 +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled")
- class CEnvironmentVariableTests(EnvironmentVariableTests):
+ class CEnvironmentVariableTests(EnvironmentVariableTests, unittest.TestCase):
      module = c_warnings
  
 +@unittest.skipUnless(support.is_resource_enabled("cmdline"), "python cmdline tests disabled")
- class PyEnvironmentVariableTests(EnvironmentVariableTests):
+ class PyEnvironmentVariableTests(EnvironmentVariableTests, unittest.TestCase):
      module = py_warnings
  
  

diff --git a/python3.spec b/python3.spec
index 61e2c0bdb9c47d7dbba202a39f12e07698369a05..d8a8a1269f41704db202f988147320cc5b1c69aa 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -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}.0
-Release:       1
+Version:       %{py_ver}.1
+Release:       0.1
 Epoch:         1
 License:       PSF
 Group:         Applications
 Source0:       http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Source0-md5: 2e7533b4009ac4adae62a7797a442e7a
+# Source0-md5: 993232d9f4d9b4863cc1ec69a792e9cd
 Patch0:                %{name}-pythonpath.patch
 Patch1:                %{name}-ac_fixes.patch
 Patch2:                %{name}-lib64.patch