- added installcompile patch (fixes config pycompilation on install to not depend...

diff --git a/python3-installcompile.patch b/python3-installcompile.patch
new file mode 100644 (file)
index 0000000..964b83c
--- /dev/null
+++ b/python3-installcompile.patch
@@ -0,0 +1,29 @@
+--- Python-3.5.0/Makefile.pre.in.orig  2016-02-28 20:07:09.864711963 +0100
++++ Python-3.5.0/Makefile.pre.in       2016-02-28 20:10:18.334704006 +0100
+@@ -1029,7 +1029,7 @@
+ 
+ commoninstall:  @FRAMEWORKALTINSTALLFIRST@ \
+               altbininstall libinstall inclinstall libainstall \
+-              sharedinstall oldsharedinstall altmaninstall \
++              sharedinstall oldsharedinstall altmaninstall installcompile \
+               @FRAMEWORKALTINSTALLLAST@
+ 
+ # Install shared libraries enabled by Setup
+@@ -1262,6 +1262,8 @@
+               $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+                       $(DESTDIR)$(LIBDEST)/distutils/tests ; \
+       fi
++
++installcompile: libainstall libinstall
+       -PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+               $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+               -d $(LIBDEST) -f \
+@@ -1654,7 +1656,7 @@
+ .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
+ .PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools
+ .PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean
+-.PHONY: smelly funny patchcheck touch altmaninstall commoninstall
++.PHONY: smelly funny patchcheck touch altmaninstall installcompile commoninstall
+ .PHONY: gdbhooks
+ 
+ # IF YOU PUT ANYTHING HERE IT WILL GO AWAY

diff --git a/python3.spec b/python3.spec
index 1ffabf133c8183e6129d6e0d04e91929b3be5424..4b6221bf6834dc6c20ced049a0febcab741f526d 100644 (file)
--- a/python3.spec
+++ b/python3.spec
@@ -52,6 +52,7 @@ Patch7:               %{name}-db.patch
 Patch8:                %{name}-install_prefix.patch
 Patch9:                %{name}-tests_with_pythonpath.patch
 Patch10:       %{name}-bdist_rpm.patch
+Patch11:       %{name}-installcompile.patch
 URL:           http://www.python.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake
@@ -477,6 +478,7 @@ Moduły testowe dla Pythona.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %{__rm} -r Modules/zlib
 %{__rm} -r Modules/expat
@@ -625,8 +627,8 @@ install -p Tools/scripts/reindent.py $RPM_BUILD_ROOT%{_bindir}/pyreindent%{py_ve
 # already in %%doc
 %{__rm} $RPM_BUILD_ROOT%{py_libdir}/LICENSE.txt
 
-mv $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h $RPM_BUILD_ROOT%{py_libdir}/config-%{py_abi}/pyconfig.h
-sed -e's#@PREFIX@#%{_prefix}#g;s#@PY_VER@#%{py_ver}#g;s#@PY_ABI@#%{py_abi}#g' %{SOURCE1} > $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h
+%{__mv} $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h $RPM_BUILD_ROOT%{py_libdir}/config-%{py_abi}/pyconfig.h
+%{__sed} -e's#@PREFIX@#%{_prefix}#g;s#@PY_VER@#%{py_ver}#g;s#@PY_ABI@#%{py_abi}#g' %{SOURCE1} > $RPM_BUILD_ROOT%{py_incdir}/pyconfig.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT