- updated rpmio/rpmdav.[ch]

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

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index 0b96381f5a27f072cbdf1501c54cad897cdfcbde..9fda9b5896f0c491ad7b4b511a9ddc0886254586 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -1,39 +1,52 @@
---- rpm-4.2/rpmdb/Makefile.am.wiget    Fri Mar 28 00:48:52 2003
-+++ rpm-4.2/rpmdb/Makefile.am  Fri Mar 28 01:06:18 2003
-@@ -26,11 +26,16 @@
+--- 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@
-+if WITHOUT_INTERNAL_DB
-+pkgbin_PROGRAMS =
-+noinst_PROGRAMS =
-+else
- pkgbin_PROGRAMS = \
-       rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify
- noinst_PROGRAMS = \
-       rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \
-       rpmdb_upgrade
-+endif
+ 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
  
---- rpm-4.2/configure.ac.wiget Fri Mar 28 01:06:49 2003
-+++ rpm-4.2/configure.ac       Fri Mar 28 01:11:34 2003
-@@ -500,6 +497,7 @@
-       [libdb3="$libdb3 $libthread"; AC_MSG_RESULT(yes)])
-    LIBS="$saveLIBS"
- fi
-+without_internal_db=yes
+ LIBS =
  
- else
- dnl ------------------ with    internal db
-@@ -510,7 +508,9 @@
-   libdb3="# \$(top_builddir)/db3/libdb.la"
-   libdb3a="\$(top_builddir)/db3/libdb.a"
- dnl  INCPATH="-I\$(top_builddir)/$(WITH_DB_SUBDIR) $INCPATH"
-+  without_internal_db=no
- fi
-+AM_CONDITIONAL(WITHOUT_INTERNAL_DB, test x$without_internal_db = xyes)
- 
- AC_SUBST(WITH_DB_SUBDIR)
- AC_SUBST(WITH_INTERNAL_DB)
+ # XXX watchout, ../db3/libdb.la created by this Makefile may surprise
+-libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la
++libdb_la = 
+ 
+ # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different
+ LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir)