From d27ccf60331245da0ce1229a6a0597cc3d4087a9 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Aug 31 2017 12:26:42 +0000
Subject: Rename patch files to start with the number


A consistent naming scheme makes managing patch files easier.

---

diff --git a/00001-rpath.patch b/00001-rpath.patch
new file mode 100644
index 0000000..9fae54c
--- /dev/null
+++ b/00001-rpath.patch
@@ -0,0 +1,19 @@
+diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
+--- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath	2009-09-04 17:29:34.000000000 -0400
++++ Python-3.1.1/Lib/distutils/unixccompiler.py	2009-09-04 17:49:54.000000000 -0400
+@@ -141,6 +141,15 @@ class UnixCCompiler(CCompiler):
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
+ 
++    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
++        """Remove standard library path from rpath"""
++        libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
++            libraries, library_dirs, runtime_library_dirs)
++        libdir = sysconfig.get_config_var('LIBDIR')
++        if runtime_library_dirs and (libdir in runtime_library_dirs):
++            runtime_library_dirs.remove(libdir)
++        return libraries, library_dirs, runtime_library_dirs
++
+     def preprocess(self, source, output_file=None, macros=None,
+                    include_dirs=None, extra_preargs=None, extra_postargs=None):
+         fixed_args = self._fix_compile_args(None, macros, include_dirs)
diff --git a/05001-powerppc-arch.patch b/05001-powerppc-arch.patch
new file mode 100644
index 0000000..10f0201
--- /dev/null
+++ b/05001-powerppc-arch.patch
@@ -0,0 +1,30 @@
+diff -up Python-3.5.0/configure.ac.than Python-3.5.0/configure.ac
+--- Python-3.5.0/configure.ac.than	2015-11-13 11:51:32.039560172 -0500
++++ Python-3.5.0/configure.ac	2015-11-13 11:52:11.670168157 -0500
+@@ -804,9 +804,9 @@ cat >> conftest.c <<EOF
+         powerpc-linux-gnuspe
+ # elif defined(__powerpc64__)
+ #  if defined(__LITTLE_ENDIAN__)
+-        powerpc64le-linux-gnu
++        ppc64le-linux-gnu
+ #  else
+-        powerpc64-linux-gnu
++        ppc64-linux-gnu
+ #  endif
+ # elif defined(__powerpc__)
+         powerpc-linux-gnu
+diff -up Python-3.5.0/configure.than Python-3.5.0/configure
+--- Python-3.5.0/configure.than	2015-11-13 12:13:19.039658399 -0500
++++ Python-3.5.0/configure	2015-11-13 12:13:35.199906857 -0500
+@@ -5153,9 +5153,9 @@ cat >> conftest.c <<EOF
+         powerpc-linux-gnuspe
+ # elif defined(__powerpc64__)
+ #  if defined(__LITTLE_ENDIAN__)
+-        powerpc64le-linux-gnu
++        ppc64le-linux-gnu
+ #  else
+-        powerpc64-linux-gnu
++        ppc64-linux-gnu
+ #  endif
+ # elif defined(__powerpc__)
+         powerpc-linux-gnu
diff --git a/Python-3.1.1-rpath.patch b/Python-3.1.1-rpath.patch
deleted file mode 100644
index 9fae54c..0000000
--- a/Python-3.1.1-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
---- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath	2009-09-04 17:29:34.000000000 -0400
-+++ Python-3.1.1/Lib/distutils/unixccompiler.py	2009-09-04 17:49:54.000000000 -0400
-@@ -141,6 +141,15 @@ class UnixCCompiler(CCompiler):
-     if sys.platform == "cygwin":
-         exe_extension = ".exe"
- 
-+    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
-+        """Remove standard library path from rpath"""
-+        libraries, library_dirs, runtime_library_dirs = super()._fix_lib_args(
-+            libraries, library_dirs, runtime_library_dirs)
-+        libdir = sysconfig.get_config_var('LIBDIR')
-+        if runtime_library_dirs and (libdir in runtime_library_dirs):
-+            runtime_library_dirs.remove(libdir)
-+        return libraries, library_dirs, runtime_library_dirs
-+
-     def preprocess(self, source, output_file=None, macros=None,
-                    include_dirs=None, extra_preargs=None, extra_postargs=None):
-         fixed_args = self._fix_compile_args(None, macros, include_dirs)
diff --git a/python3-powerppc-arch.patch b/python3-powerppc-arch.patch
deleted file mode 100644
index 10f0201..0000000
--- a/python3-powerppc-arch.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up Python-3.5.0/configure.ac.than Python-3.5.0/configure.ac
---- Python-3.5.0/configure.ac.than	2015-11-13 11:51:32.039560172 -0500
-+++ Python-3.5.0/configure.ac	2015-11-13 11:52:11.670168157 -0500
-@@ -804,9 +804,9 @@ cat >> conftest.c <<EOF
-         powerpc-linux-gnuspe
- # elif defined(__powerpc64__)
- #  if defined(__LITTLE_ENDIAN__)
--        powerpc64le-linux-gnu
-+        ppc64le-linux-gnu
- #  else
--        powerpc64-linux-gnu
-+        ppc64-linux-gnu
- #  endif
- # elif defined(__powerpc__)
-         powerpc-linux-gnu
-diff -up Python-3.5.0/configure.than Python-3.5.0/configure
---- Python-3.5.0/configure.than	2015-11-13 12:13:19.039658399 -0500
-+++ Python-3.5.0/configure	2015-11-13 12:13:35.199906857 -0500
-@@ -5153,9 +5153,9 @@ cat >> conftest.c <<EOF
-         powerpc-linux-gnuspe
- # elif defined(__powerpc64__)
- #  if defined(__LITTLE_ENDIAN__)
--        powerpc64le-linux-gnu
-+        ppc64le-linux-gnu
- #  else
--        powerpc64-linux-gnu
-+        ppc64-linux-gnu
- #  endif
- # elif defined(__powerpc__)
-         powerpc-linux-gnu
diff --git a/python3.spec b/python3.spec
index 14fd81e..e78a343 100644
--- a/python3.spec
+++ b/python3.spec
@@ -14,7 +14,7 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 Version: %{pybasever}.2
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: Python
 
 
@@ -247,9 +247,10 @@ Source10: idle3.desktop
 # AppData file for idle3
 Source11: idle3.appdata.xml
 
+# 00001 #
 # Fixup distutils/unixccompiler.py to remove standard library path from rpath:
 # Was Patch0 in ivazquez' python3000 specfile:
-Patch1:         Python-3.1.1-rpath.patch
+Patch1:         00001-rpath.patch
 
 # 00055 #
 # Systemtap support: add statically-defined probe points
@@ -448,9 +449,10 @@ Patch273: 00273-skip-float-test.patch
 #
 #     https://fedoraproject.org/wiki/SIGs/Python/PythonPatches
 
+# 05001 #
 # add correct arch for ppc64/ppc64le
 # it should be ppc64le-linux-gnu/ppc64-linux-gnu instead powerpc64le-linux-gnu/powerpc64-linux-gnu
-Patch5001: python3-powerppc-arch.patch
+Patch5001: 05001-powerppc-arch.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -1665,6 +1667,9 @@ fi
 # ======================================================
 
 %changelog
+* Mon Aug 28 2017 Petr Viktorin <pviktori@redhat.com> - 3.6.2-13
+- Rename patch files to be consistent
+
 * Mon Aug 28 2017 Michal Cyprian <mcyprian@redhat.com> - 3.6.2-12
 - Use python3 style of calling super() without arguments in rpath
   patch to prevent recursion in UnixCCompiler subclasses