From 9cc8a2d881ce3bae7573a734fa5dc3c2039b654aca20e1ef891b033458e16abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 30 Jan 2018 16:10:19 +0000 Subject: [PATCH] - Add patch python-fix-shebang.patch to fix bsc#1078326 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=219 --- python-base.changes | 5 +++++ python-base.spec | 3 +++ python-doc.spec | 3 +++ python-fix-shebang.patch | 20 ++++++++++++++++++++ python.spec | 3 +++ 5 files changed, 34 insertions(+) create mode 100644 python-fix-shebang.patch diff --git a/python-base.changes b/python-base.changes index 9d8525e..b396993 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 30 16:08:33 UTC 2018 - tchvatal@suse.com + +- Add patch python-fix-shebang.patch to fix bsc#1078326 + ------------------------------------------------------------------- Fri Dec 22 16:49:38 UTC 2017 - jmatejek@suse.com diff --git a/python-base.spec b/python-base.spec index 228d1ee..0511256 100644 --- a/python-base.spec +++ b/python-base.spec @@ -56,6 +56,8 @@ Patch34: python-2.7.9-sles-disable-verification-by-default.patch Patch35: python-ncurses-6.0-accessors.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch +# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang +Patch39: python-fix-shebang.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -159,6 +161,7 @@ other applications. %endif %patch35 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-doc.spec b/python-doc.spec index 51e3388..eaae423 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -57,6 +57,8 @@ Patch34: python-2.7.9-sles-disable-verification-by-default.patch Patch35: python-ncurses-6.0-accessors.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch +# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang +Patch39: python-fix-shebang.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -106,6 +108,7 @@ Python, and Macintosh Module Reference in PDF format. %endif %patch35 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python-fix-shebang.patch b/python-fix-shebang.patch new file mode 100644 index 0000000..e7de566 --- /dev/null +++ b/python-fix-shebang.patch @@ -0,0 +1,20 @@ +From 448c6739877a4143a2c3599f041fa6127f354044 Mon Sep 17 00:00:00 2001 +From: Victor Stinner +Date: Thu, 23 Nov 2017 17:04:34 +0100 +Subject: [PATCH] bpo-29512: Fix Lib/test/bisect.py shebang (#4522) + +Replace python3 with python2. +--- + Lib/test/bisect.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/test/bisect.py b/Lib/test/bisect.py +index 6fc561890262..1bf32ef06dd9 100755 +--- a/Lib/test/bisect.py ++++ b/Lib/test/bisect.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python3 ++#!/usr/bin/env python2 + """ + Command line tool to bisect failing CPython tests. + diff --git a/python.spec b/python.spec index b8b34b8..8c4b0af 100644 --- a/python.spec +++ b/python.spec @@ -62,6 +62,8 @@ Patch34: python-2.7.9-sles-disable-verification-by-default.patch Patch35: python-ncurses-6.0-accessors.patch # PATCH-FIX-UPSTREAM bmwiedemann@suse.de -- allow python packages to build reproducibly Patch38: reproducible.patch +# PATCH-FIX-UPSTREAM taken from upstream fix py3 shebang +Patch39: python-fix-shebang.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -212,6 +214,7 @@ that rely on earlier non-verification behavior. %endif %patch35 -p1 %patch38 -p1 +%patch39 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac