PR#15: [DO NOT MERGE] Update to 3.6.8rc1 - rpms/python36

rpms / python36

#15 [DO NOT MERGE] Update to 3.6.8rc1

Closed 5 years ago by churchyard. Opened 5 years ago by churchyard.

rpms/ churchyard/python36 368rc1 into master

Update to 3.6.8rc1

Miro Hrončok • 5 years ago

06128c3

00111-no-static-lib.patch

file modified

+8 -15

		`@@ -1,8 +1,8 @@`
		`diff --git a/Makefile.pre.in b/Makefile.pre.in`
		`- index 4b093e3..1088435 100644`
		`+ index 15b020c..bc460a3 100644`
		`--- a/Makefile.pre.in`
		`+++ b/Makefile.pre.in`
		`- @@ -543,7 +543,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c`
		`+ @@ -542,7 +542,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c`
		`$(PYTHON_FOR_REGEN) ./Tools/clinic/clinic.py --make`

		`# Build the interpreter`
		`@@ -11,26 +11,20 @@`
		`$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)`

		`platform: $(BUILDPYTHON) pybuilddir.txt`
		`- @@ -588,18 +588,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o`
		`+ @@ -590,12 +590,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o`
		`+ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \`
		`$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build`

		`-`
		`+ -`
		`-# Build static library`
		`- -# avoid long command lines, same as LIBRARY_OBJS`
		`-$(LIBRARY): $(LIBRARY_OBJS)`
		`- -rm -f $@`
		`- - $(AR) $(ARFLAGS) $@ Modules/getbuildinfo.o`
		`- - $(AR) $(ARFLAGS) $@ $(PARSER_OBJS)`
		`- - $(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)`
		`- - $(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o`
		`- - $(AR) $(ARFLAGS) $@ $(MODULE_OBJS)`
		`- - $(AR) $(ARFLAGS) $@ $(MODOBJS)`
		`- - $(RANLIB) $@`
		`+ - $(AR) $(ARFLAGS) $@ $(LIBRARY_OBJS)`
		`-`
		`libpython$(LDVERSION).so: $(LIBRARY_OBJS)`
		`if test $(INSTSONAME) != $(LDLIBRARY); then \`
		`$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \`
		`- @@ -689,7 +677,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist`
		`+ @@ -685,7 +679,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist`
		`echo "-----------------------------------------------"; \`
		`fi`

		`@@ -39,7 +33,7 @@`
		`$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)`

		`############################################################################`
		`- @@ -1425,18 +1413,6 @@ libainstall: @DEF_MAKE_RULE@ python-config`
		`+ @@ -1421,17 +1415,6 @@ libainstall: @DEF_MAKE_RULE@ python-config`
		`else true; \`
		`fi; \`
		`done`
		`@@ -49,7 +43,6 @@`
		`- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \`
		`- else \`
		`- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \`
		`- - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \`
		`- fi; \`
		`- else \`
		`- echo Skip install of $(LIBRARY) - use make frameworkinstall; \`

00189-use-rpm-wheels.patch

file modified

+2 -2

		`@@ -16,9 +16,9 @@`

		`+_WHEEL_DIR = "/usr/share/python-wheels/"`

		`- -_SETUPTOOLS_VERSION = "39.0.1"`
		`+ -_SETUPTOOLS_VERSION = "40.6.2"`

		`- -_PIP_VERSION = "10.0.1"`
		`+ -_PIP_VERSION = "18.1"`
		`+def _get_most_recent_wheel_version(pkg):`
		`+ prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))`
		`+ suffix = "-py2.py3-none-any.whl"`

python36.spec

file modified

+10 -6

		`@@ -13,8 +13,9 @@`

		`# WARNING When rebasing to a new Python version,`
		`# remember to update the python3-docs package as well`
		`- Version: %{pybasever}.7`
		`- Release: 1%{?dist}`
		`+ Version: %{pybasever}.8`
		`+ %global prerel rc1`
		`+ Release: 0.1.%{prerel}%{?dist}`
		`License: Python`


		`@@ -454,8 +455,8 @@`
		`Requires: python-setuptools-wheel`
		`Requires: python-pip-wheel`
		`%else`
		`- Provides: bundled(python3-pip) = 10.0.1`
		`- Provides: bundled(python3-setuptools) = 39.0.1`
		`+ Provides: bundled(python3-pip) = 18.1`
		`+ Provides: bundled(python3-setuptools) = 40.6.2`
		`%endif`

		`# There are files in the standard library that have python shebang.`
		`@@ -622,8 +623,8 @@`
		`Requires: python-setuptools-wheel`
		`Requires: python-pip-wheel`
		`%else`
		`- Provides: bundled(python3-pip) = 10.0.1`
		`- Provides: bundled(python3-setuptools) = 39.0.1`
		`+ Provides: bundled(python3-pip) = 18.1`
		`+ Provides: bundled(python3-setuptools) = 40.6.2`
		`%endif`

		`# The description for the flat package`
		`@@ -1557,6 +1558,9 @@`
		`# ======================================================`

		`%changelog`
		`+ * Thu Dec 13 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.8-0.1.rc1`
		`+ - Update to 3.6.8rc1`
		`+`
		`* Mon Oct 22 2018 Miro Hrončok <mhroncok@redhat.com> - 3.6.7-1`
		`- Update to 3.6.7`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (Python-3.6.7.tar.xz) = 7be753046db8d12fc00f90d9c1b2edcc5ae80ac39e9d0d8d07553081a26f59a60c0d0cf6986006f0729f425d5751273110db3aa2d413d9405fafa9bd6c052fdf`
		`+ SHA512 (Python-3.6.8rc1.tar.xz) = f579544bc77aebe492733ff2644385310911eb29ccd7e20ed3ef5b3c540d7a1c5ae153ec3d323f2e95574604ae2ff4ee3de62ddbc86c1fab6a44093d99e7251d`