diff --git a/platform-python.patch b/platform-python.patch index 62cac3d..f92ac48 100644 --- a/platform-python.patch +++ b/platform-python.patch @@ -178,6 +178,15 @@ index 8b6454f..bf83e4f 100644 if test -n "$(DLLLIBRARY)"; then \ $(LDSHARED) -Wl,--out-implib=$@ -o $(DLLLIBRARY) $^ \ $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST); \ +@@ -1346,7 +1346,7 @@ + python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh + # Substitution happens here, as the completely-expanded BINDIR + # is not available in configure +- sed -e "s,@EXENAME@,$(BINDIR)/python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py ++ sed -e "s,@EXENAME@,/usr/libexec/platform-python$(LDVERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py + # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} + LC_ALL=C sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' < Misc/python-config.sh >python-config + # On Darwin, always use the python version of the script, the shell @@ -1485,12 +1485,12 @@ frameworkinstallstructure: $(LDLIBRARY) # Install a number of symlinks to keep software that expects a normal unix # install (which includes python-config) happy. diff --git a/platform-python.spec b/platform-python.spec index 92720a8..edcb970 100644 --- a/platform-python.spec +++ b/platform-python.spec @@ -405,8 +405,6 @@ Summary: Platform Python runtime libraries # yet upgraded expat: Requires: expat >= 2.1.0 -%define __requires_exclude ^(/usr/bin/python3.*|python\\(abi\\) = 3\\..*)$ - # Python 3 built with glibc >= 2.24.90-26 needs to require it (rhbz#1410644). Requires: glibc%{?_isa} >= 2.24.90-26 @@ -1254,6 +1252,7 @@ CheckPython optimized - Remove bundled setuptools, pip, ensurepip - Have /usr/libexec symlink point from generic to specific version binaries - Adjust summaries and descriptions for platfrom-python +- Remove __requires_exclude - Specfile cleanup * Thu Aug 10 2017 Tomas Orsava - 3.6.2-9