#23 sync epel branches
Closed 3 months ago by carlwgeorge. Opened 4 months ago by carlwgeorge.
epel7  into  el6

file modified
+1

@@ -1,3 +1,4 @@ 

  /Python-3.4.3.tar.xz

  /Python-3.4.5.tar.xz

  /Python-3.4.8.tar.xz

+ /Python-3.4.9.tar.xz

00001-rpath.patch Python-3.1.1-rpath.patch
file renamed
+3 -4

@@ -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)

file removed
-12

@@ -1,12 +0,0 @@ 

- # Note that the path could itself be a python file, or a directory

- 

- # Python's compile_all module only works on directories, and requires a max

- # recursion depth

- 

- %py_byte_compile()\

- python_binary="%1"\

- bytecode_compilation_path="%2"\

- find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\

- \

- find $bytecode_compilation_path -type f -a -name "*.py" -print0 | xargs -0 $python_binary -O -c 'import py_compile, sys; [py_compile.compile(f, dfile=f.partition("$RPM_BUILD_ROOT")[2]) for f in sys.argv[1:]]' || :\

- %{nil}

file modified
+17 -13

@@ -152,8 +152,8 @@ 

  # ==================

  Summary: Version 3 of the Python programming language aka Python 3000

  Name: python%{pyshortver}

- Version: %{pybasever}.8

- Release: 1%{?dist}

+ Version: %{pybasever}.9

+ Release: 3%{?dist}

  License: Python

  Group: Development/Languages

  

@@ -232,11 +232,6 @@ 

  %global _use_internal_dependency_generator 0

  %global __find_provides %{SOURCE1}

  

- # Supply an RPM macro "py_byte_compile" for the python3-devel subpackage

- # to enable specfiles to selectively byte-compile individual files and paths

- # with different Python runtimes as necessary:

- Source3: macros.pybytecompile%{pybasever}

- 

  # Systemtap tapset to make it easier to use the systemtap static probes

  # (actually a template; LIBRARY_PATH will get fixed up during install)

  # Written by dmalcolm; not yet sent upstream

@@ -255,9 +250,10 @@ 

  # Written by bkabrda

  Source8: check-pyc-and-pyo-timestamps.py

  

+ # 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

  

  # readline test fails on EL6 readline 6.0

  # https://bugs.python.org/issue19884

@@ -1377,10 +1373,6 @@ 

  find %{buildroot} \

      -perm 555 -exec chmod 755 {} \;

  

- # Install macros for rpm:

- mkdir -p %{buildroot}/%{rpmmacrodir}

- install -m 644 %{SOURCE3} %{buildroot}/%{rpmmacrodir}/

- 

  # Ensure that the curses module was linked against libncursesw.so, rather than

  # libncurses.so (bug 539917)

  ldd %{buildroot}/%{dynload_dir}/_curses*.so \

@@ -1802,7 +1794,6 @@ 

  %if 0%{?main_python3}

  %{_libdir}/pkgconfig/python3.pc

  %endif

- %{rpmmacrodir}/macros.pybytecompile%{pybasever}

  

  %files tools

  %if 0%{?main_python3}

@@ -1966,6 +1957,19 @@ 

  # ======================================================

  

  %changelog

+ * Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 3.4.9-3

+ - Rebuilt to change main python from 3.4 to 3.6

+ 

+ * Mon Feb 04 2019 Carl George <carl@george.computer> - 3.4.9-2

+ - Use python3 style of calling super() without arguments in rpath

+   patch to prevent recursion in UnixCCompiler subclasses (#1593660)

+ 

+ * Sun Aug 05 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.9-1

+ - Rebased to 3.4.9

+ 

+ * Thu Jul 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.4.8-2

+ - Move macros to python-rpm-macros (#1599809)

+ 

  * Thu Mar 22 2018 Carl George <carl@george.computer> - 3.4.8-1

  - Latest upstream

  - Patches 242, 248, and 286 merged upstream

file modified
+1 -1

@@ -1,1 +1,1 @@ 

- SHA512 (Python-3.4.8.tar.xz) = 478552c72efe606cb1993024b81839c51d01f1c949564c007ab2b76016f110e1f7bd418e5de3f4f93b466ce7dbe6583d3c150830d1f28f75e0809625b568a7ec

+ SHA512 (Python-3.4.9.tar.xz) = 4ca37abfb99d04ed360002dbba18cc9fbecc6c02b14e3796c353800a2982ad2d18dd73150c29f37f57a02f60a7b3b34364b95f454e3cda68bd174fce2341bd3f

no initial comment

are epel6 python-rpm-macros up to date for this?

homer

Whoops, I missed that part. I see now I need to get https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/10 implemented in epel6 first.

I forgot what was the problem here. the other PR is merged. should we proceed and do a joined update?

python-rpm-macros#10 was merged into the epel7 branch, but those changes haven't yet been done on the el6 branch to facilitate this pull request.

Just opened python-rpm-macros#17 to achieve this.

1 new commit added

  • Rebuilt to change main python from 3.4 to 3.6
3 months ago

Closing this in favor of #26 so that more commits aren't accidentally included.

Pull-Request has been closed by carlwgeorge

3 months ago