- compress debuginfo sections with zlib (reduce /usr/lib/debug size).

[packages/rpm.git] / rpm-system_libs-more.patch

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index a9beb07e538ef348a58ffa76f030f69d56869dc5..9fda9b5896f0c491ad7b4b511a9ddc0886254586 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -1,25 +1,44 @@
---- rpm-4.4.2/Makefile.am.orig 2005-07-23 13:43:15.166991248 +0200
-+++ rpm-4.4.2/Makefile.am      2005-07-23 13:45:33.725927088 +0200
-@@ -15,7 +15,7 @@
-       po/*.in po/*.po po/rpm.pot \
-       rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
- 
--SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
- 
- INCLUDES = \
-       -I$(top_srcdir)/build \
-diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
---- rpm-4.3.org/rpmdb/Makefile.am      2003-12-28 01:33:46.160517288 +0100
-+++ rpm-4.3/rpmdb/Makefile.am  2003-12-28 01:56:22.000000000 +0100
-@@ -25,17 +25,13 @@
+--- rpm-4.4.8/configure.ac.orig        2007-04-08 16:26:29.303992000 +0200
++++ rpm-4.4.8/configure.ac     2007-04-08 16:35:11.461748504 +0200
+@@ -662,7 +662,7 @@
+ 
+ dnl ------------------ with    internal db
+ AC_DEFINE(HAVE_DB3_DB_H, 1, [Define if you have the <db3/db.h> header file])
+-WITH_DB_SUBDIR=db3
++WITH_DB_SUBDIR=
+ WITH_INTERNAL_DB=1
+ DBLIBSRCS="db3.c"
+ 
+--- rpm-4.5/configure.ac~      2008-04-13 03:20:07.000000000 +0300
++++ rpm-4.5/configure.ac       2008-04-13 03:23:45.011443406 +0300
+@@ -1203,7 +1215,7 @@
+ dnl # XXX Propagate -lucb to popt ...
+ dnl export LIBS INCPATH CONFIG_SITE
+ 
+-AC_CONFIG_SUBDIRS(file db3)
++AC_CONFIG_SUBDIRS(file)
+ 
+ AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+       scripts/perl.req scripts/perl.prov
+--- rpm-4.5/rpmdb/Makefile.am~ 2008-04-13 03:28:19.000000000 +0300
++++ rpm-4.5/rpmdb/Makefile.am  2008-04-13 13:49:10.122086563 +0300
+@@ -25,25 +25,18 @@
+ tjfn_LDADD = librpmdb.la
+ 
+ pkgincdir = $(pkgincludedir)
+-pkginc_HEADERS = db.h header.h hdrinline.h rpmdb.h
++pkginc_HEADERS = header.h hdrinline.h rpmdb.h
  noinst_HEADERS = fprint.h header_internal.h legacy.h
  
- pkgbindir = @RPMCONFIGDIR@
--pkgbin_PROGRAMS = \
--      rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump rpmdb_load \
--      rpmdb_printlog rpmdb_recover rpmdb_svc rpmdb_stat rpmdb_upgrade \
--      rpmdb_verify 
+ pkglibdir =           @USRLIBRPM@
+ versionlibdir =       $(pkglibdir)/@VERSION@
+-versionlib_PROGRAMS = \
+-      db_archive db_checkpoint db_deadlock db_dump \
+-      db_hotbackup db_load db_printlog db_recover \
+-      db_stat db_upgrade db_verify 
+-if WITH_DB_RPC
+-versionlib_PROGRAMS += db_svc
+-endif
  
  mylibs = librpmdb.la
  
@@ -31,12 +50,3 @@ diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am
  
  # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
  LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)
-@@ -52,7 +49,7 @@
-       $(top_builddir)/rpmio/librpmio.la \
-       @WITH_POPT_LIB@ \
-       @WITH_LIBELF_LIB@
--librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
-+librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) -ldb
- librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
- 
- # XXX make sure that db.h symlink is generated