[packages/python3] - up to 3.5.2

arekm arekm at pld-linux.org
Sun Aug 14 22:17:55 CEST 2016


commit 1e9d9e53de431321c263fe0ed54ddbd0a65024b9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Aug 14 22:17:50 2016 +0200

    - up to 3.5.2

 python3-multilib.patch     | 14 ++++----------
 python3-test-pyexpat.patch | 11 +++++++++++
 python3.spec               | 10 ++++++----
 3 files changed, 21 insertions(+), 14 deletions(-)
---
diff --git a/python3.spec b/python3.spec
index 19ceb09..e78304d 100644
--- 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}.1
-Release:	4
+Version:	%{py_ver}.2
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
 Source0:	https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Source0-md5:	e9ea6f2623fffcdd871b7b19113fde80
+# Source0-md5:	8906efbacfcdc7c3c9198aeefafd159e
 Source1:	pyconfig.h.in
 Patch0:		%{name}-pythonpath.patch
 Patch1:		%{name}-ac_fixes.patch
@@ -53,7 +53,8 @@ Patch9:		%{name}-tests_with_pythonpath.patch
 Patch10:	%{name}-bdist_rpm.patch
 Patch11:	%{name}-installcompile.patch
 Patch12:                https://bugs.python.org/file21896/nonexistent_user.patch
-# Patch12-md5:  db706fbe6de467c6e4c97c675eddf29a
+# Patch12-md5:	db706fbe6de467c6e4c97c675eddf29a
+Patch13:	python3-test-pyexpat.patch
 URL:		https://www.python.org/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake
@@ -481,6 +482,7 @@ Moduły testowe dla Pythona.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %{__rm} -r Modules/zlib
 %{__rm} -r Modules/expat
diff --git a/python3-multilib.patch b/python3-multilib.patch
index f5a49b0..f9e3554 100644
--- a/python3-multilib.patch
+++ b/python3-multilib.patch
@@ -196,8 +196,8 @@ diff -dur Python-3.5.0.orig/Makefile.pre.in Python-3.5.0/Makefile.pre.in
 diff -dur Python-3.5.0.orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
 --- Python-3.5.0.orig/Modules/getpath.c	2015-09-13 13:41:24.000000000 +0200
 +++ Python-3.5.0/Modules/getpath.c	2015-12-03 17:31:03.874280444 +0100
-@@ -117,9 +117,21 @@
- #define EXEC_PREFIX PREFIX
+@@ -100,6 +100,17 @@
+  extern "C" {
  #endif
  
 +#ifndef LIB_PYTHON
@@ -211,15 +211,9 @@ diff -dur Python-3.5.0.orig/Modules/getpath.c Python-3.5.0/Modules/getpath.c
 +#define LIB_PYTHON "lib/python"
 +#endif
 +#endif
-+
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
--              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/" LIB_PYTHON VERSION ":" \
-+              EXEC_PREFIX "/" LIB_PYTHON VERSION "/lib-dynload:"
- #endif
  
- #ifndef LANDMARK
+ #if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
+ #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
 @@ -511,7 +523,7 @@
      _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL);
      _prefix = Py_DecodeLocale(PREFIX, NULL);
diff --git a/python3-test-pyexpat.patch b/python3-test-pyexpat.patch
new file mode 100644
index 0000000..728b7c8
--- /dev/null
+++ b/python3-test-pyexpat.patch
@@ -0,0 +1,11 @@
+--- Python-3.5.2/Lib/test/test_pyexpat.py~	2016-06-25 23:38:37.000000000 +0200
++++ Python-3.5.2/Lib/test/test_pyexpat.py	2016-08-14 22:01:10.891946983 +0200
+@@ -660,7 +660,7 @@ class MalformedInputTest(unittest.TestCa
+             parser.Parse(xml, True)
+             self.fail()
+         except expat.ExpatError as e:
+-            self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 14')
++            self.assertEqual(str(e), 'XML declaration not well-formed: line 1, column 13')
+ 
+ class ErrorMessageTest(unittest.TestCase):
+     def test_codes(self):
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python3.git/commitdiff/1e9d9e53de431321c263fe0ed54ddbd0a65024b9



More information about the pld-cvs-commit mailing list