RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Apr-2009 19:22:23
Branch: HEAD Handle: 2009041517222200
Modified files:
rpm configure.ac devtool.conf
Log:
- jbj: backout the python hackery now that the AutoFu is fixed.
Summary:
Revision Changes Path
2.363 +1 -1 rpm/configure.ac
2.287 +2 -2 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.362 -r2.363 configure.ac
--- rpm/configure.ac 15 Apr 2009 12:38:44 -0000 2.362
+++ rpm/configure.ac 15 Apr 2009 17:22:22 -0000 2.363
@@ -1251,7 +1251,7 @@
dnl # Python embedding
RPM_CHECK_LIB(
[Python embedding], [pythonembed],
- [python2.6 python2.5 python], [Py_Initialize], [Python.h],
+ [python2.6 python2.5], [Py_Initialize], [Python.h],
[no,external:none], [],
[
], [])
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.286 -r2.287 devtool.conf
--- rpm/devtool.conf 15 Apr 2009 11:50:26 -0000 2.286
+++ rpm/devtool.conf 15 Apr 2009 17:22:22 -0000 2.287
@@ -93,10 +93,10 @@
--with-libelf \
--with-selinux \
--with-python \
- --with-pythonembed=/usr/lib:/usr/include/python \
+ --with-pythonembed=/usr/lib:/usr/include/python2.5 \
--with-perl \
--with-perlembed=/usr/lib/perl5/5.10.0/i386-linux-thread-multi/CORE \
- --with-rubyembed=/usr/lib:/usr/lib/ruby/1.8/1386-linux \
+ --with-rubyembed=/usr/lib/ruby/1.8/i386-linux \
--with-build-extlibdep \
--with-build-maxextlibdep \
--enable-build-pic \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
