- Fix configure.ac for correct version of PYTHON_FO_REGEN

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=284
This commit is contained in:
Matej Cepl 2020-05-30 12:23:29 +00:00 committed by Git OBS Bridge
parent d32abf9b40
commit ec904350ee
7 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ AC_SUBST(host)
# pybuilddir.txt will be created by --generate-posix-vars in the Makefile
rm -f pybuilddir.txt
-AC_CHECK_PROGS(PYTHON_FOR_REGEN, python$PACKAGE_VERSION python3 python, python3)
+AC_CHECK_PROGS(PYTHON_FOR_REGEN, python$PACKAGE_VERSION python python2, python)
AC_SUBST(PYTHON_FOR_REGEN)
if test "$cross_compiling" = yes; then

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 30 12:19:40 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Fix configure.ac for correct version of PYTHON_FO_REGEN
-------------------------------------------------------------------
Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -94,6 +94,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch
# PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com
# Improve documentation warning against the possible zip bombs
Patch59: CVE-2019-9674-zip-bomb.patch
# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com
# PYTHON_FOR_REGEN value is set very weird upstream
Patch60: configure_PYTHON_FOR_REGEN.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake
@ -219,6 +222,7 @@ other applications.
%patch56 -p1
%patch58 -p1
%patch59 -p1
%patch60 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 30 12:19:40 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Fix configure.ac for correct version of PYTHON_FO_REGEN
-------------------------------------------------------------------
Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -96,6 +96,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch
# PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com
# Improve documentation warning against the possible zip bombs
Patch59: CVE-2019-9674-zip-bomb.patch
# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com
# PYTHON_FOR_REGEN value is set very weird upstream
Patch60: configure_PYTHON_FOR_REGEN.patch
# COMMON-PATCH-END
Provides: pyth_doc
Provides: pyth_ps
@ -162,6 +165,7 @@ Python, and Macintosh Module Reference in PDF format.
%patch56 -p1
%patch58 -p1
%patch59 -p1
%patch60 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat May 30 12:19:40 UTC 2020 - Matej Cepl <mcepl@suse.com>
- Fix configure.ac for correct version of PYTHON_FO_REGEN
-------------------------------------------------------------------
Mon Apr 27 06:56:55 UTC 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -96,6 +96,9 @@ Patch58: CVE-2020-8492-urllib-ReDoS.patch
# PATCH-FIX-UPSTREAM CVE-2019-9674-zip-bomb.patch bsc#1162825 mcepl@suse.com
# Improve documentation warning against the possible zip bombs
Patch59: CVE-2019-9674-zip-bomb.patch
# PATCH-FIX-UPSTREAM configure_PYTHON_FOR_REGEN.patch bsc#1078326 mcepl@suse.com
# PYTHON_FOR_REGEN value is set very weird upstream
Patch60: configure_PYTHON_FOR_REGEN.patch
# COMMON-PATCH-END
BuildRequires: automake
BuildRequires: db-devel
@ -276,6 +279,7 @@ that rely on earlier non-verification behavior.
%patch56 -p1
%patch58 -p1
%patch59 -p1
%patch60 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac