use python2 explicitly in configure

This commit is contained in:
h00465007 2020-02-28 09:36:23 +08:00
parent 6b5be6dbc3
commit 3b5d3c594c
2 changed files with 42 additions and 9 deletions

View File

@ -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 <hexiujun1@huawei.com> - 0.27-5
- Type:enhancement
- Id:NA
- SUG:NA
- DESC:use python2 explicitly in configure
* Wed Jan 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.27-4
- Type:bugfix
- Id:NA

View File

@ -0,0 +1,25 @@
From 23315167127777c5fbd2abcd2e4fb58382f37179 Mon Sep 17 00:00:00 2001
From: hexiujun <hexiujun1@huawei.com>
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