RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 15-Jul-2008 20:57:09
Branch: HEAD Handle: 2008071518570900
Modified files:
rpm CHANGES configure.ac
Log:
do not complain with "python: file not found" on platforms without
python(1) in PATH and make it more clear that the argument "2.x" really
means a literal "2.x" and not something like "2.[0-9]"...
Summary:
Revision Changes Path
1.2485 +1 -0 rpm/CHANGES
2.304 +3 -3 rpm/configure.ac
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2484 -r1.2485 CHANGES
--- rpm/CHANGES 15 Jul 2008 12:35:59 -0000 1.2484
+++ rpm/CHANGES 15 Jul 2008 18:57:09 -0000 1.2485
@@ -1,5 +1,6 @@
5.1.0 -> 5.2a0:
+ - rse: configure: do not complain with "python: file not found" on
platforms without python(1) in PATH
- rpm.org: use "Mono/.Net assembly" for mono magic.
- jbj: rpmdav: OPTIONS on every new dir needs thought. per-session for
now.
- jbj: rpmdav: on 302, append the trailing '/' and retry. wotta pita.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.303 -r2.304 configure.ac
--- rpm/configure.ac 14 Jun 2008 15:45:31 -0000 2.303
+++ rpm/configure.ac 15 Jul 2008 18:57:09 -0000 2.304
@@ -838,7 +838,7 @@
python_version="2.5 2.4 2.3 2.x"
;;
*)
- AC_MSG_WARN([--with-python only supports values 2.x, 2.3,
2.4, or 2.5, ignoring...])
+ AC_MSG_WARN([--with-python only supports values "2.x",
"2.3", "2.4", or "2.5", ignoring...])
python_version=""
;;
esac
@@ -916,9 +916,9 @@
done
fi
AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR],
[directory with Python include files]),
- [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c
'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
+ [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`(python -c
'from distutils.sysconfig import get_python_inc; print get_python_inc()')
2>/dev/null`"])
AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR],
[directory with Python library]),
- [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c
'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
+ [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`(python -c
'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
2>/dev/null`"])
])
AC_SUBST(WITH_PYTHON_SUBDIR)
AC_SUBST(WITH_PYTHON_SUBPACKAGE)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
