From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 7 Nov 2018 19:35:09 +0000 (+0100)
Subject: - up to 3.7.1
X-Git-Tag: auto/th/python3-3.7.1-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpython3.git;a=commitdiff_plain;h=e6d5ff00e4ad0971ac45baf1a2849b275fbe1994

- up to 3.7.1
---

diff --git a/python3-redundant_declaration.patch b/python3-redundant_declaration.patch
deleted file mode 100644
index 34af370..0000000
--- a/python3-redundant_declaration.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c919252a28f4e9dd326dc2c703b4eee6e247be83 Mon Sep 17 00:00:00 2001
-From: "Miss Islington (bot)"
- <31488909+miss-islington@users.noreply.github.com>
-Date: Fri, 29 Jun 2018 16:03:07 -0700
-Subject: [PATCH] Fix redundant declaration of _PyImport_AddModuleObject
- (GH-7992)
-
-(cherry picked from commit f874bd1f0630644f3e3faaa2d51e6749465c70bd)
-
-Co-authored-by: Jeremy Cline <jeremy@jcline.org>
----
- Include/import.h | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Include/import.h b/Include/import.h
-index 13f32a1004cf..c664803478a5 100644
---- a/Include/import.h
-+++ b/Include/import.h
-@@ -54,9 +54,6 @@ PyAPI_FUNC(PyObject *) PyImport_AddModuleObject(
-     PyObject *name
-     );
- #endif
--#ifndef Py_LIMITED_API
--PyAPI_FUNC(PyObject *) _PyImport_AddModuleObject(PyObject *, PyObject *);
--#endif
- PyAPI_FUNC(PyObject *) PyImport_AddModule(
-     const char *name            /* UTF-8 encoded string */
-     );
diff --git a/python3.spec b/python3.spec
index 7681a48..b556804 100644
--- a/python3.spec
+++ b/python3.spec
@@ -41,13 +41,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:	4
+Version:	%{py_ver}.1
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
 Source0:	https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-# Source0-md5:	eb8c2a6b1447d50813c02714af4681f3
+# Source0-md5:	0a57e9022c07fad3dadb2eef58568edb
 Source1:	pyconfig.h.in
 Patch0:		%{name}-pythonpath.patch
 Patch1:		%{name}-ac_fixes.patch
@@ -63,8 +63,6 @@ Patch11:	%{name}-installcompile.patch
 # https://bugs.python.org/file21896/nonexistent_user.patch
 Patch12:        nonexistent_user.patch
 Patch13:	%{name}-no-randomize-tests.patch
-# https://github.com/python/cpython/commit/c919252a28f4e9dd326dc2c703b4eee6e247be83.patch
-Patch14:	%{name}-redundant_declaration.patch
 URL:		https://www.python.org/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake
@@ -496,7 +494,6 @@ Moduły testowe dla Pythona.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 %{__rm} -r Modules/expat