From 3b5d3c594cfcaf4ca7db3e79dec33dccb70b5881 Mon Sep 17 00:00:00 2001 From: h00465007 Date: Fri, 28 Feb 2020 09:36:23 +0800 Subject: [PATCH] use python2 explicitly in configure --- satyr.spec | 26 +++++++++++++++-------- use-python2-explicitly-in-configure.patch | 25 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 use-python2-explicitly-in-configure.patch diff --git a/satyr.spec b/satyr.spec index af72c0e..9a37776 100644 --- a/satyr.spec +++ b/satyr.spec @@ -1,15 +1,17 @@ %define with_python2 1 %define with_python3 1 -Name: satyr -Version: 0.27 -Release: 4 -Summary: Tools to create anonymous, machine-friendly problem reports -License: GPLv2+ -URL: https://github.com/abrt/satyr -Source0: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Name: satyr +Version: 0.27 +Release: 5 +Summary: Tools to create anonymous, machine-friendly problem reports +License: GPLv2+ +URL: https://github.com/abrt/satyr +Source0: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel libtool +Patch9001: use-python2-explicitly-in-configure.patch + +BuildRequires: elfutils-devel elfutils-libelf-devel binutils-devel rpm-devel libtool BuildRequires: doxygen pkgconfig automake gcc-c++ gdb git %if %{with_python2} @@ -83,7 +85,7 @@ python3 for satyr %install %make_install %delete_la - + %check make check|| { find tests/testsuite.dir -name "testsuite.log" -print -exec cat '{}' \; @@ -120,6 +122,12 @@ make check|| { %{_mandir}/* %changelog +* Fri Feb 28 2020 hexiujun - 0.27-5 +- Type:enhancement +- Id:NA +- SUG:NA +- DESC:use python2 explicitly in configure + * Wed Jan 22 2020 openEuler Buildteam - 0.27-4 - Type:bugfix - Id:NA diff --git a/use-python2-explicitly-in-configure.patch b/use-python2-explicitly-in-configure.patch new file mode 100644 index 0000000..385e878 --- /dev/null +++ b/use-python2-explicitly-in-configure.patch @@ -0,0 +1,25 @@ +From 23315167127777c5fbd2abcd2e4fb58382f37179 Mon Sep 17 00:00:00 2001 +From: hexiujun +Date: Fri, 28 Feb 2020 09:29:00 +0800 +Subject: [PATCH] use python2 explicitly in configure + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index dca3c2d..9baa188 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,7 @@ AC_ARG_WITH([python2], + AM_CONDITIONAL(WITH_PYTHON2, [test $with_python2 = yes]) + [if test "$with_python2" = "yes"] + [then] +- AC_PATH_PROG([PYTHON], [python], [no]) ++ AC_PATH_PROG([PYTHON], [python2], [no]) + [if test "$PYTHON" = "no"] + [then] + [echo "The python program was not found in the search path. Please ensure"] +-- +1.8.3.1 +