From 8b3e871c1fbf2946dfbfe0b418c496bb7a4a074f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 29 Jun 2018 11:16:01 +0300 Subject: [PATCH] Invoke python2 explicitly from test-suite to unbreak build --- rpm-4.14.1-explicit-python2.patch | 12 ++++++++++++ rpm.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 rpm-4.14.1-explicit-python2.patch diff --git a/rpm-4.14.1-explicit-python2.patch b/rpm-4.14.1-explicit-python2.patch new file mode 100644 index 0000000..8eec835 --- /dev/null +++ b/rpm-4.14.1-explicit-python2.patch @@ -0,0 +1,12 @@ +diff -up rpm-4.14.1/tests/local.at.python2 rpm-4.14.1/tests/local.at +--- rpm-4.14.1/tests/local.at.python2 2018-06-29 11:11:42.716541572 +0300 ++++ rpm-4.14.1/tests/local.at 2017-09-06 14:58:13.034317976 +0300 +@@ -17,7 +17,7 @@ def myprint(msg = ''): + sys.stdout.write('%s\n' % msg) + $1 + EOF +-python2 test.py ++python test.py + ]]) + + m4_define([RPMPY_CHECK],[ diff --git a/rpm.spec b/rpm.spec index f329969..7863ade 100644 --- a/rpm.spec +++ b/rpm.spec @@ -23,7 +23,7 @@ %global rpmver 4.14.1 #global snapver rc2 -%global rel 11 +%global rel 12 %global srcver %{version}%{?snapver:-%{snapver}} %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x} @@ -74,6 +74,10 @@ Patch7: rpm-4.14.1-Add-envvar-that-will-be-present-during-RPM-build.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1581224 Patch8: 4.14.1-find-debuginfo-pie.patch +# More Python 3 fallout, invoke python2 explicitly to avoid deprecation +# warnings breaking the test-suite +Patch9: rpm-4.14.1-explicit-python2.patch + # Patches already upstream: # These are not yet upstream @@ -605,6 +609,9 @@ make check || cat tests/rpmtests.log %doc doc/librpm/html/* %changelog +* Fri Jun 29 2018 Panu Matilainen - 4.14.2-12 +- Invoke python2 explicitly from test-suite to unbreak build + * Fri Jun 29 2018 Panu Matilainen - 4.14.2-11 - Remove direct ldconfig calls, use compat macros instead