rpms/python3.11
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Since upstream issue 23968, the platform directory changed to include the architectures,

Browse Source 
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.
This commit is contained in:
Charalampos Stratakis 2017-04-05 18:08:56 +02:00
parent b603b2d8f9
commit bea97d96d2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
00205-make-libpl-respect-lib64.patch
View File

@ -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 # Install the library and miscellaneous stuff needed for extending/embedding
# This goes into $(exec_prefix) # This goes into $(exec_prefix)
-LIBPL= @LIBPL@ -LIBPL= @LIBPL@
+LIBPL= $(LIBDEST)/config-$(LDVERSION) +LIBPL= $(LIBDEST)/config-$(LDVERSION)-$(MULTIARCH)
# pkgconfig directory # pkgconfig directory
LIBPC= $(LIBDIR)/pkgconfig LIBPC= $(LIBDIR)/pkgconfig

15
python3.spec
View File

@ -123,7 +123,7 @@
Summary: Version 3 of the Python programming language aka Python 3000 Summary: Version 3 of the Python programming language aka Python 3000
Name: python3 Name: python3
Version: %{pybasever}.1 Version: %{pybasever}.1
Release: 1%{?dist} Release: 2%{?dist}
License: Python License: Python
Group: Development/Languages Group: Development/Languages
@ -1441,8 +1441,8 @@ fi
# "Makefile" and the config-32/64.h file are needed by # "Makefile" and the config-32/64.h file are needed by
# distutils/sysconfig.py:_init_posix(), so we include them in the core # distutils/sysconfig.py:_init_posix(), so we include them in the core
# package, along with their parent directories (bug 531901): # package, along with their parent directories (bug 531901):
%dir %{pylibdir}/config-%{LDVERSION_optimized}/ %dir %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/
%{pylibdir}/config-%{LDVERSION_optimized}/Makefile %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile
%dir %{_includedir}/python%{LDVERSION_optimized}/ %dir %{_includedir}/python%{LDVERSION_optimized}/
%{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h} %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
@ -1457,8 +1457,8 @@ fi
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{pylibdir}/config-%{LDVERSION_optimized}/* %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/*
%exclude %{pylibdir}/config-%{LDVERSION_optimized}/Makefile %exclude %{pylibdir}/config-%{LDVERSION_optimized}-%{_arch}-linux%{_gnu}/Makefile
%{_includedir}/python%{LDVERSION_optimized}/*.h %{_includedir}/python%{LDVERSION_optimized}/*.h
%exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h} %exclude %{_includedir}/python%{LDVERSION_optimized}/%{_pyconfig_h}
%doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit %doc Misc/README.valgrind Misc/valgrind-python.supp Misc/gdbinit
@ -1607,7 +1607,7 @@ fi
%endif %endif
# Analog of the -devel subpackage's files: # Analog of the -devel subpackage's files:
%{pylibdir}/config-%{LDVERSION_debug} %{pylibdir}/config-%{LDVERSION_debug}-%{_arch}-linux%{_gnu}
%{_includedir}/python%{LDVERSION_debug} %{_includedir}/python%{LDVERSION_debug}
%{_bindir}/python%{LDVERSION_debug}-config %{_bindir}/python%{LDVERSION_debug}-config
%{_libdir}/libpython%{LDVERSION_debug}.so %{_libdir}/libpython%{LDVERSION_debug}.so
@ -1648,6 +1648,9 @@ fi
# ====================================================== # ======================================================
%changelog %changelog
* Wed Apr 05 2017 Charalampos Stratakis <cstratak@redhat.com> - 3.6.1-2
- Install the Makefile in its proper location (rhbz#1438219)
* Wed Mar 22 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.1-1 * Wed Mar 22 2017 Iryna Shcherbina <ishcherb@redhat.com> - 3.6.1-1
- Update to version 3.6.1 final - Update to version 3.6.1 final