openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File no-python2.diff of Package rpm (Revision 5d320b12513492cdb4a15bcc8f172ac0)

Currently displaying revision 5d320b12513492cdb4a15bcc8f172ac0 , Show latest

Do not use /usr/bin/python2 instead of /usr/bin/python

This reverts commit ace86dc61aa5bb29bbb09551b6876c94fc50a782

--- configure.ac
+++ configure.ac
@@ -129,8 +129,7 @@ AC_MSG_CHECKING(old version of patch)
 
 AC_PATH_PROG(__PERL, perl, /usr/bin/perl, $MYPATH)
 AC_PATH_PROG(__PGP, pgp, /usr/bin/pgp, $MYPATH)
-AC_PATH_PROG(__PYTHON, python2, /usr/bin/python2, $MYPATH)
-AC_PATH_PROG(PYTHON, python2, /usr/bin/python2, $MYPATH)
+AC_PATH_PROG(__PYTHON, python, /usr/bin/python, $MYPATH)
 AC_PATH_PROG(__RM, rm, /bin/rm, $MYPATH)
 AC_PATH_PROG(__RSH, rsh, /usr/bin/rsh, $MYPATH)
 AC_PATH_PROG(__SED, sed, /bin/sed, $MYPATH)
--- tests/atlocal.in
+++ tests/atlocal.in
@@ -3,7 +3,7 @@ export LD_LIBRARY_PATH
 PATH="${abs_builddir}/testing@rpmbindir@:${abs_builddir}/testing@usrbindir@:$PATH"
 export PATH
 
-PYLIBDIR=`python2 -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1,0,'@execprefix@'))"`
+PYLIBDIR=`python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1,0,'@execprefix@'))"`
 PYTHONPATH="${abs_builddir}/testing${PYLIBDIR}"
 export PYTHONPATH
 
--- tests/local.at
+++ tests/local.at
@@ -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],[

Places

File no-python2.diff of Package rpm (Revision 5d320b12513492cdb4a15bcc8f172ac0)

Places