From eef42fd7ea9065fbb33026ca99ffd86566e14567 Mon Sep 17 00:00:00 2001 From: Michal Cyprian Date: Wed, 30 Aug 2017 14:52:53 +0200 Subject: [PATCH] Use python3 style of calling super() without arguments in rpath patch --- Python-3.1.1-rpath.patch | 7 +++---- python3.spec | 7 ++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Python-3.1.1-rpath.patch b/Python-3.1.1-rpath.patch index 1493af2..9fae54c 100644 --- a/Python-3.1.1-rpath.patch +++ b/Python-3.1.1-rpath.patch @@ -1,15 +1,14 @@ 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,16 @@ class UnixCCompiler(CCompiler): +@@ -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( -+ self.__class__, self)._fix_lib_args(libraries, library_dirs, -+ runtime_library_dirs) ++ 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) diff --git a/python3.spec b/python3.spec index 7509aa4..14fd81e 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: 11%{?dist} +Release: 12%{?dist} License: Python @@ -1665,6 +1665,11 @@ fi # ====================================================== %changelog +* Mon Aug 28 2017 Michal Cyprian - 3.6.2-12 +- Use python3 style of calling super() without arguments in rpath + patch to prevent recursion in UnixCCompiler subclasses +Resolves: rhbz#1458122 + * Mon Aug 21 2017 Petr Viktorin - 3.6.2-11 - Add bcond for --without optimizations - Reword package descriptions