From bea97d96d29c1893f4c695da96a9d62f69618ff6 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Wed, 5 Apr 2017 18:08:56 +0200 Subject: [PATCH 1/2] Since upstream issue 23968, the platform directory changed to include the architectures, however patch205 was not updated to reflect that and as a result the Makefile and various other files were installed at another directory (rhbz#1438219). This commit updates the patch205 so the files are installed at the correct locations. --- 00205-make-libpl-respect-lib64.patch | 2 +- python3.spec | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/00205-make-libpl-respect-lib64.patch b/00205-make-libpl-respect-lib64.patch index 4a6703b..3e7c797 100644 --- a/00205-make-libpl-respect-lib64.patch +++ b/00205-make-libpl-respect-lib64.patch @@ -6,7 +6,7 @@ diff -up Python-3.5.0/Makefile.pre.in.lib Python-3.5.0/Makefile.pre.in # Install the library and miscellaneous stuff needed for extending/embedding # This goes into $(exec_prefix) -LIBPL= @LIBPL@ -+LIBPL= $(LIBDEST)/config-$(LDVERSION) ++LIBPL= $(LIBDEST)/config-$(LDVERSION)-$(MULTIARCH) # pkgconfig directory LIBPC= $(LIBDIR)/pkgconfig diff --git a/python3.spec b/python3.spec index bcb9a92..9ab4201 100644 --- a/python3.spec +++ b/python3.spec @@ -123,7 +123,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.1 -Release: 1%{?dist} +Release: 2%{?dist} License: Python Group: Development/Languages @@ -1441,8 +1441,8 @@ fi # "Makefile" and the config-32/64.h file are needed by # distutils/sysconfig.py:_init_posix(), so we include them in the core # package, along with their parent directories (bug 531901): -%dir %{pylibdir}/config-%{LDVERSION_optimized}/ -%{pylibdir}/config-%{LDVERSION_optimized}/Makefile +%dir %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/ +%{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile %dir %{_includedir}/python%{LDVERSION_optimized}/ %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h} @@ -1457,8 +1457,8 @@ fi %files devel %defattr(-,root,root) -%{pylibdir}/config-%{LDVERSION_optimized}/* -%exclude %{pylibdir}/config-%{LDVERSION_optimized}/Makefile +%{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/* +%exclude %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile %{_includedir}/python%{LDVERSION_optimized}/*.h %exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h} %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit @@ -1607,7 +1607,7 @@ fi %endif # Analog of the -devel subpackage's files: -%{pylibdir}/config-%{LDVERSION_debug} +%{pylibdir}/config-%{LDVERSION_debug}-%{_arch}-linux%{_gnu} %{_includedir}/python%{LDVERSION_debug} %{_bindir}/python%{LDVERSION_debug}-config %{_libdir}/libpython%{LDVERSION_debug}.so @@ -1648,6 +1648,9 @@ fi # ====================================================== %changelog +* Wed Apr 05 2017 Charalampos Stratakis - 3.6.1-2 +- Install the Makefile in its proper location (rhbz#1438219) + * Wed Mar 22 2017 Iryna Shcherbina - 3.6.1-1 - Update to version 3.6.1 final From 3a35e0ba67ad2d10d7176f0c6f1285693b3092a6 Mon Sep 17 00:00:00 2001 From: Tomas Orsava Date: Thu, 13 Apr 2017 16:20:52 +0200 Subject: [PATCH 2/2] Rename python3.Xdm-config script from -debug to be arch specific (rhbz#1179073) --- python3.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/python3.spec b/python3.spec index 9ab4201..a501288 100644 --- a/python3.spec +++ b/python3.spec @@ -123,7 +123,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.1 -Release: 2%{?dist} +Release: 3%{?dist} License: Python Group: Development/Languages @@ -1099,7 +1099,7 @@ sed \ %endif # with_systemtap -# Rename the script that differs on different arches to arch specific name +# Rename the -devel script that differs on different arches to arch specific name mv %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-{,`uname -m`-}config echo -e '#!/bin/sh\nexec `dirname $0`/python%{LDVERSION_optimized}-`uname -m`-config "$@"' > \ %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config @@ -1107,6 +1107,14 @@ echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_optimized}-`uname %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_optimized}-config +# Rename the -debug script that differs on different arches to arch specific name +mv %{buildroot}%{_bindir}/python%{LDVERSION_debug}-{,`uname -m`-}config +echo -e '#!/bin/sh\nexec `dirname $0`/python%{LDVERSION_debug}-`uname -m`-config "$@"' > \ + %{buildroot}%{_bindir}/python%{LDVERSION_debug}-config +echo '[ $? -eq 127 ] && echo "Could not find python%{LDVERSION_debug}-`uname -m`-config. Look around to see available arches." >&2' >> \ + %{buildroot}%{_bindir}/python%{LDVERSION_debug}-config + chmod +x %{buildroot}%{_bindir}/python%{LDVERSION_debug}-config + # System Python: Copy the executable to libexec mkdir -p %{buildroot}%{_libexecdir} cp %{buildroot}%{_bindir}/python%{pybasever} %{buildroot}%{_libexecdir}/system-python @@ -1610,6 +1618,7 @@ fi %{pylibdir}/config-%{LDVERSION_debug}-%{_arch}-linux%{_gnu} %{_includedir}/python%{LDVERSION_debug} %{_bindir}/python%{LDVERSION_debug}-config +%{_bindir}/python%{LDVERSION_debug}-*-config %{_libdir}/libpython%{LDVERSION_debug}.so %{_libdir}/libpython%{LDVERSION_debug}.so.1.0 %{_libdir}/pkgconfig/python-%{LDVERSION_debug}.pc @@ -1648,6 +1657,10 @@ fi # ====================================================== %changelog +* Thu Apr 13 2017 Tomas Orsava - 3.6.1-3 +- Rename python3.Xdm-config script from -debug to be arch specific +Resolves: rhbz#1179073 + * Wed Apr 05 2017 Charalampos Stratakis - 3.6.1-2 - Install the Makefile in its proper location (rhbz#1438219)