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-Aug-2011 22:32:43
Branch: HEAD Handle: 2011081520324102
Modified files:
rpm CHANGES
rpm/build Makefile.am
rpm/lib Makefile.am
rpm/misc Makefile.am
rpm/rpmconstant Makefile.am
rpm/rpmdb Makefile.am
rpm/rpmio Makefile.am
Log:
- fix: subdir is needed to find loader maps.
Summary:
Revision Changes Path
1.3668 +1 -0 rpm/CHANGES
2.82 +1 -1 rpm/build/Makefile.am
2.207 +1 -1 rpm/lib/Makefile.am
1.59 +1 -1 rpm/misc/Makefile.am
1.16 +2 -2 rpm/rpmconstant/Makefile.am
1.136 +1 -1 rpm/rpmdb/Makefile.am
1.298 +1 -1 rpm/rpmio/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3667 -r1.3668 CHANGES
--- rpm/CHANGES 15 Aug 2011 20:26:40 -0000 1.3667
+++ rpm/CHANGES 15 Aug 2011 20:32:41 -0000 1.3668
@@ -1,4 +1,5 @@
HEAD:
+ - jbj: fix: subdir is needed to find loader maps.
- jbj: include Pascal's pom2spec java -> *.rpm wrapper from
https://gitorious.org/pbleser/pbleser/blobs/raw/master/pom2spec)
- proyvind: add sparc64v2 arch to %sparcx.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/Makefile.am
============================================================================
$ cvs diff -u -r2.81 -r2.82 Makefile.am
--- rpm/build/Makefile.am 16 Jun 2011 14:45:25 -0000 2.81
+++ rpm/build/Makefile.am 15 Aug 2011 20:32:42 -0000 2.82
@@ -41,7 +41,7 @@
parseSpec.c poptBT.c reqprov.c spec.c
librpmbuild_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmbuild_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmbuild.vers
+librpmbuild_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/build/librpmbuild.vers
endif
librpmbuild_la_LIBADD =
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/Makefile.am
============================================================================
$ cvs diff -u -r2.206 -r2.207 Makefile.am
--- rpm/lib/Makefile.am 16 Jun 2011 14:45:27 -0000 2.206
+++ rpm/lib/Makefile.am 15 Aug 2011 20:32:42 -0000 2.207
@@ -71,7 +71,7 @@
transaction.c verify.c rpmluaext.c
librpm_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpm_la_LDFLAGS += -Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpm.vers
+librpm_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/lib/librpm.vers
endif
librpm_la_LIBADD =
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.58 -r1.59 Makefile.am
--- rpm/misc/Makefile.am 16 Jun 2011 14:45:27 -0000 1.58
+++ rpm/misc/Makefile.am 15 Aug 2011 20:32:42 -0000 1.59
@@ -28,7 +28,7 @@
librpmmisc_la_SOURCES = librpmmisc.c
librpmmisc_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmmisc_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmmisc.vers
+librpmmisc_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/misc/librpmmisc.vers
endif
librpmmisc_la_LDFLAGS += \
@WITH_DB_LDFLAGS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmconstant/Makefile.am
============================================================================
$ cvs diff -u -r1.15 -r1.16 Makefile.am
--- rpm/rpmconstant/Makefile.am 16 Jun 2011 14:45:27 -0000 1.15
+++ rpm/rpmconstant/Makefile.am 15 Aug 2011 20:32:42 -0000 1.16
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.15 2011/06/16 14:45:27 devzero2000 Exp $
+# $Id: Makefile.am,v 1.16 2011/08/15 20:32:42 jbj Exp $
AUTOMAKE_OPTIONS = 1.4 foreign
@@ -33,7 +33,7 @@
rpmconstant_internal.c
librpmconstant_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmconstant_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmconstant.vers
+librpmconstant_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmconstant/librpmconstant.vers
endif
librpmconstant_la_LIBADD = \
$(top_builddir)/rpmio/librpmio.la \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/Makefile.am
============================================================================
$ cvs diff -u -r1.135 -r1.136 Makefile.am
--- rpm/rpmdb/Makefile.am 16 Jun 2011 14:45:28 -0000 1.135
+++ rpm/rpmdb/Makefile.am 15 Aug 2011 20:32:43 -0000 1.136
@@ -80,7 +80,7 @@
$(logio_LSOURCES)
librpmdb_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmdb_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmdb.vers
+librpmdb_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmdb/librpmdb.vers
endif
librpmdb_la_LIBADD = $(DBLIBOBJS)
if ENABLE_BUILD_INTLIBDEP
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.297 -r1.298 Makefile.am
--- rpm/rpmio/Makefile.am 16 Jun 2011 14:45:28 -0000 1.297
+++ rpm/rpmio/Makefile.am 15 Aug 2011 20:32:43 -0000 1.298
@@ -109,7 +109,7 @@
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
-librpmio_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/librpmio.vers
+librpmio_la_LDFLAGS +=
-Wl,@LD_VERSION_SCRIPT_FLAG@,@top_srcdir@/rpmio/librpmio.vers
endif
librpmio_la_LIBADD = -lm
if ENABLE_BUILD_INTLIBDEP
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
