RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jul-2007 19:13:20
Branch: HEAD Handle: 2007070218132000
Modified files:
rpm CHANGES
rpm/python Makefile.am
Log:
The change ensures that the _rpmmodule.so python module is linked the same
as rpm. W/o the included changes you may get dlopen errors looking for
beecrypt or other components not linked in to librpmmisc. The other changes
ensure that db.h and related can be found as well.
Summary:
Revision Changes Path
1.1425 +1 -0 rpm/CHANGES
1.72 +10 -4 rpm/python/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1424 -r1.1425 CHANGES
--- rpm/CHANGES 2 Jul 2007 12:10:11 -0000 1.1424
+++ rpm/CHANGES 2 Jul 2007 17:13:20 -0000 1.1425
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - mgh: ensure the rpm python module is linked the same as the rest of RPM
- rse: prune the 23MB large db/docs/ third-party subtree to no longer
ship it in RPM distribution tarballs.
- rse: allow installation paths to be overridden via "configure" options
--with-path-xxx.
- rse: re-generate lib/getdate.c with newer GNU bison 2.3
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/Makefile.am
============================================================================
$ cvs diff -u -r1.71 -r1.72 Makefile.am
--- rpm/python/Makefile.am 26 Jun 2007 18:19:08 -0000 1.71
+++ rpm/python/Makefile.am 2 Jul 2007 17:13:20 -0000 1.72
@@ -18,6 +18,10 @@
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
-I$(top_srcdir)/misc \
+ @WITH_DB_CPPFLAGS@ \
+ @WITH_ZLIB_CPPFLAGS@ \
+ @WITH_LUA_CPPFLAGS@ \
+ @WITH_FILE_CPPFLAGS@ \
-I$(pyincdir)
noinst_HEADERS = header-py.h \
@@ -25,14 +29,16 @@
rpmfi-py.h rpmmi-py.h rpmps-py.h rpmrc-py.h rpmte-py.h rpmts-py.h \
spec-py.h
-mylibs= \
+mylibs = \
$(top_builddir)/build/librpmbuild.la \
$(top_builddir)/lib/librpm.la \
$(top_builddir)/rpmdb/librpmdb.la \
- $(top_builddir)/rpmio/librpmio.la
+ $(top_builddir)/rpmio/librpmio.la \
+ $(top_builddir)/misc/librpmmisc.la \
+ @LTLIBINTL@
-LDADD =
-LIBS =
+#LDADD =
+#LIBS =
rpmdir = $(pylibdir)/site-packages/rpm
rpm_LTLIBRARIES = _rpmmodule.la
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
