[packages/rpm] Make %{__python} expand to /usr/bin/python2
jajcus
jajcus at pld-linux.org
Sat Nov 28 14:07:07 CET 2015
commit b5cd30d4663d152c34818a3f5804c562e18aca7c
Author: Jacek Konieczny <jajcus at jajcus.net>
Date: Sat Nov 28 13:46:47 2015 +0100
Make %{__python} expand to /usr/bin/python2
This will make switching the to Python 3 in future (if we decide to)
much easier.
Release: 28
python2_explicit.patch | 11 +++++++++++
rpm.spec | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 6944aa3..bb744a2 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 5.4.15
-Release: 27
+Release: 28
License: LGPL v2.1
Group: Base
# http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -179,6 +179,7 @@ Patch89: disable-header-verification.patch
Patch90: %{name}-cppcompat.patch
Patch91: py-disable-fetch.patch
Patch92: fast_python_deps.patch
+Patch93: python2_explicit.patch
# Patches imported from Mandriva
@@ -1016,6 +1017,7 @@ cd -
%patch83 -p1
%patch92 -p1
+%patch93 -p1
%patch1050 -p1
diff --git a/python2_explicit.patch b/python2_explicit.patch
new file mode 100644
index 0000000..acc6e2e
--- /dev/null
+++ b/python2_explicit.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.15/configure.ac~ 2015-11-28 13:11:46.816903917 +0100
++++ rpm-5.4.15/configure.ac 2015-11-28 13:14:39.887776863 +0100
+@@ -604,7 +604,7 @@
+ AC_PATH_PROG(__PERL, perl, %{_bindir}/perl, $MYPATH)
+ AC_PATH_PROG(__PGP, pgp, %{_bindir}/pgp, $MYPATH)
+ AC_PATH_PROG(__PHP, php, %{_bindir}/php, $MYPATH)
+-AC_PATH_PROG(__PYTHON, python, %{_bindir}/python, $MYPATH)
++AC_PATH_PROG(__PYTHON, python2, %{_bindir}/python2, $MYPATH)
+ AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
+ AC_PATH_PROG(__RMDIR, rmdir, /bin/rmdir, $MYPATH)
+ AC_PATH_PROG(__RSH, rsh, %{_bindir}/rsh, $MYPATH)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/b5cd30d4663d152c34818a3f5804c562e18aca7c
More information about the pld-cvs-commit
mailing list