X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-system_libs.patch;h=32812e92c20eab75a78d1115abf3b5edef6310ec;hb=a4134598e5fe6b29635c156d8a70bc991793a693;hp=e858e1fc7aa87ac79ea14f7b47d41d2ccdd5e081;hpb=f6609ff7ac3d14dd9ec4f0eaba3f632e478d30ed;p=packages%2Frpm.git

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
index e858e1f..32812e9 100644
--- a/rpm-system_libs.patch
+++ b/rpm-system_libs.patch
@@ -1,6 +1,135 @@
---- rpm-4.3/rpmio/Makefile.am.wiget	2003-06-11 02:05:34.000000000 +0200
-+++ rpm-4.3/rpmio/Makefile.am	2003-06-11 02:05:34.000000000 +0200
-@@ -65,34 +65,34 @@
+diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac
+--- rpm-4.3.org/configure.ac	2004-01-07 02:28:38.420706689 +0100
++++ rpm-4.3/configure.ac	2004-01-07 02:29:17.078719715 +0100
+@@ -425,6 +425,18 @@
+ AC_SUBST(WITH_BEECRYPT_INCLUDE)
+ AC_SUBST(WITH_BEECRYPT_LIB)
+ 
++WITH_POPT_SUBDIR=
++WITH_POPT_LIB=
++AC_CHECK_HEADERS([popt.h])
++AC_CHECK_LIB(popt, poptGetContext, [
++       AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
++       WITH_POPT_LIB="-lpopt"
++       ],[WITH_POPT_SUBDIR="popt"
++       WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
++
++AC_SUBST(WITH_POPT_SUBDIR)
++AC_SUBST(WITH_POPT_LIB)
++
+ AC_CHECK_FUNC(setreuid, [], [
+     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
+ ])
+@@ -1193,7 +1205,7 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+ 
+-AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
++AC_CONFIG_SUBDIRS(file)
+ 
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+ 	scripts/perl.req scripts/perl.prov
+@@ -1216,7 +1228,7 @@
+ 	python/rpmdb/Makefile
+ 	python/rpmdb/test/Makefile
+   ])
+-AC_CONFIG_COMMANDS([default],[[	echo timestamp > popt/stamp-h.in
++AC_CONFIG_COMMANDS([default],[[	
+ 	echo timestamp > stamp-h.in
+   
+ ]],[[]])
+diff -urN rpm-4.3.org/lib/Makefile.am rpm-4.3/lib/Makefile.am
+--- rpm-4.3.org/lib/Makefile.am	2004-01-07 02:27:38.909001150 +0100
++++ rpm-4.3/lib/Makefile.am	2004-01-07 02:29:44.348085397 +0100
+@@ -40,7 +40,7 @@
+ librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \
+ 	$(top_builddir)/rpmdb/librpmdb.la \
+ 	$(top_builddir)/rpmio/librpmio.la \
+-	$(top_builddir)/popt/libpopt.la \
++	-lpopt \
+ 	@WITH_SELINUX_LIB@
+ 
+ getdate.c: getdate.y
+diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am
+--- rpm-4.3.org/Makefile.am	2004-01-07 02:27:37.031389024 +0100
++++ rpm-4.3/Makefile.am	2004-01-07 02:29:17.082718889 +0100
+@@ -14,7 +14,7 @@
+ 	po/*.in po/*.po po/rpm.pot \
+ 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
+ 
+-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@  rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@  rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/build \
+@@ -22,7 +22,6 @@
+ 	-I$(top_srcdir)/rpmdb \
+ 	-I$(top_srcdir)/rpmio \
+ 	@WITH_BEECRYPT_INCLUDE@ \
+-	-I$(top_srcdir)/popt \
+ 	@WITH_LIBELF_INCLUDE@ \
+ 	@INCPATH@
+ 
+@@ -34,7 +33,7 @@
+ 	$(top_builddir)/lib/librpm.la \
+ 	$(top_builddir)/rpmdb/librpmdb.la \
+ 	$(top_builddir)/rpmio/librpmio.la \
+-	$(top_builddir)/popt/libpopt.la \
++	-lpopt \
+ 	@WITH_ZLIB_LIB@ \
+ 	@INTLLIBS@ \
+ 	@LIBMISC@
+@@ -107,7 +106,6 @@
+ 	    -load lib/rpmlib.lcd \
+ 	    -load rpmdb/rpmdb.lcd \
+ 	    -load rpmio/rpmio.lcd \
+-	    -load popt/popt.lcd \
+ 		$(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
+ 
+ .PHONY:	lint
+@@ -117,9 +115,7 @@
+ 		`make -s sources -C lib` \
+ 		`make -s sources -C rpmdb` \
+ 		`make -s sources -C rpmio` \
+-		`make -s sources -C beecrypt` \
+-		`make -s sources -C file/src` \
+-		`make -s sources -C popt`
++		`make -s sources -C file/src`
+ 
+ CVSTAG = r$(subst .,-,$(VERSION))
+ 
+diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
+--- rpm-4.3.org/rpmdb/Makefile.am	2004-01-07 02:28:11.926180317 +0100
++++ rpm-4.3/rpmdb/Makefile.am	2004-01-07 02:29:17.087717856 +0100
+@@ -9,7 +9,6 @@
+ 	-I$(top_srcdir)/lib \
+ 	-I$(top_srcdir)/rpmio \
+ 	@WITH_BEECRYPT_INCLUDE@ \
+-	-I$(top_srcdir)/popt \
+ 	@WITH_LIBELF_INCLUDE@ \
+ 	@INCPATH@
+ 
+@@ -51,7 +50,7 @@
+ 	tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -release 4.3 \
+ 	$(top_builddir)/rpmio/librpmio.la \
+-	$(top_builddir)/popt/libpopt.la \
++	@WITH_POPT_LIB@ \
+ 	@WITH_LIBELF_LIB@
+ librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
+ librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
+diff -urN rpm-4.3.org/rpmio/Makefile.am rpm-4.3/rpmio/Makefile.am
+--- rpm-4.3.org/rpmio/Makefile.am	2004-01-07 02:27:43.915966813 +0100
++++ rpm-4.3/rpmio/Makefile.am	2004-01-07 02:29:17.090717237 +0100
+@@ -11,7 +11,6 @@
+ INCLUDES = -I. \
+ 	-I$(top_srcdir) \
+ 	@WITH_BEECRYPT_INCLUDE@ \
+-	-I$(top_srcdir)/popt \
+ 	@INCPATH@
+ 
+ pkgincdir = $(pkgincludedir)
+@@ -65,34 +64,34 @@
  	$(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES)
  
  tdigest_SOURCES = tdigest.c
@@ -43,31 +172,18 @@
  
  tsw_SOURCES = tsw.c
  tsw_LDFLAGS = librpmio.la
---- rpm-4.3/rpmdb/Makefile.am.wiget	2003-05-23 17:00:19.000000000 +0200
-+++ rpm-4.3/rpmdb/Makefile.am	2003-06-11 02:05:34.000000000 +0200
-@@ -49,7 +49,7 @@
- 	tagname.c tagtbl.c
- librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	@WITH_POPT_LIB@ \
- 	@WITH_LIBELF_LIB@ \
- 	@libdb3@
- librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
---- rpm-4.3/lib/Makefile.am.wiget	2003-05-23 16:59:36.000000000 +0200
-+++ rpm-4.3/lib/Makefile.am	2003-06-11 02:05:34.000000000 +0200
-@@ -40,7 +40,7 @@
- librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la
-+	@WITH_POPT_LIB@
- 
- getdate.c: getdate.y
- 	@echo expect 10 shift/reduce conflicts
---- rpm-4.3/tools/Makefile.am.wiget	2003-05-23 17:00:27.000000000 +0200
-+++ rpm-4.3/tools/Makefile.am	2003-06-11 02:05:34.000000000 +0200
-@@ -40,7 +40,7 @@
+diff -urN rpm-4.3.org/tools/Makefile.am rpm-4.3/tools/Makefile.am
+--- rpm-4.3.org/tools/Makefile.am	2004-01-07 02:27:44.830777831 +0100
++++ rpm-4.3/tools/Makefile.am	2004-01-07 02:29:17.096715997 +0100
+@@ -9,7 +9,6 @@
+ 	-I$(top_srcdir)/rpmdb \
+ 	-I$(top_srcdir)/rpmio \
+ 	@WITH_BEECRYPT_INCLUDE@ \
+-	-I$(top_srcdir)/popt \
+ 	@WITH_LIBELF_INCLUDE@ \
+ 	@WITH_LIBDWARF_INCLUDE@ \
+ 	-I$(top_srcdir)/file/src \
+@@ -38,7 +37,7 @@
  
  debugedit_SOURCES =	debugedit.c hashtab.c
  debugedit_LDADD =	@LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
@@ -76,85 +192,3 @@
  
  javadeps_SOURCES =	javadeps.c
  
---- rpm-4.3/configure.ac.wiget	2003-06-11 02:05:34.000000000 +0200
-+++ rpm-4.3/configure.ac	2003-06-11 02:05:34.000000000 +0200
-@@ -431,6 +431,17 @@
- AC_SUBST(WITH_BEECRYPT_INCLUDE)
- AC_SUBST(WITH_BEECRYPT_LIB)
- 
-+WITH_POPT_SUBDIR=
-+WITH_POPT_LIB=
-+AC_CHECK_HEADERS([popt.h])
-+AC_CHECK_LIB(popt, poptGetContext, [
-+	AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.])
-+	WITH_POPT_LIB="-lpopt"
-+	],[WITH_POPT_SUBDIR="popt"
-+	WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"])
-+	
-+AC_SUBST(WITH_POPT_SUBDIR)
-+AC_SUBST(WITH_POPT_LIB)
- AC_CHECK_FUNC(setreuid, [], [
-     AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi])
- ])
-@@ -491,6 +502,7 @@
- 
- dnl Check for Berkeley db3 API.
- AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"],
-+  AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"],
-   AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"],
-     AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"],
-       AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"],
-@@ -499,6 +511,7 @@
-       )
-     )
-   )
-+  )
- )
- 
- if test X"$DBLIBSRCS" = X; then
-@@ -1257,7 +1270,7 @@
- dnl # XXX Propagate -lucb to popt ...
- dnl export LIBS INCPATH CONFIG_SITE
- 
--AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)
-+AC_CONFIG_SUBDIRS(beecrypt file)
- 
- AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
- 	scripts/perl.req scripts/perl.prov
-@@ -1281,7 +1294,7 @@
- 	python/rpmdb/test/Makefile
- 	python/mpw/Makefile
- 	python/mpw/test/Makefile
--  ], [	echo timestamp > popt/stamp-h.in
-+  ], [	
- 	echo timestamp > beecrypt/stamp-h.in
- 	echo timestamp > stamp-h.in
-   ]
---- rpm-4.3/Makefile.am.wiget	2003-05-23 16:57:23.000000000 +0200
-+++ rpm-4.3/Makefile.am	2003-06-11 02:08:38.000000000 +0200
-@@ -14,7 +14,7 @@
- 	po/*.in po/*.po po/rpm.pot \
- 	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
- 
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@  rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@  rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
- 
- INCLUDES = \
- 	-I$(top_srcdir)/build \
-@@ -34,7 +34,7 @@
- 	$(top_builddir)/lib/librpm.la \
- 	$(top_builddir)/rpmdb/librpmdb.la \
- 	$(top_builddir)/rpmio/librpmio.la \
--	$(top_builddir)/popt/libpopt.la \
-+	-lpopt \
- 	@WITH_ZLIB_LIB@ \
- 	@INTLLIBS@ \
- 	@LIBMISC@
-@@ -105,7 +105,6 @@
- 	    -load lib/rpmlib.lcd \
- 	    -load rpmdb/rpmdb.lcd \
- 	    -load rpmio/rpmio.lcd \
--	    -load popt/popt.lcd \
- 		$(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
- 
- .PHONY:	lint