- updated mono,javadeps patches to stop using javadeps by default

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

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index 0b96381f5a27f072cbdf1501c54cad897cdfcbde..822f26a9f459f141db6966ea244c2d6be91c2424 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -1,39 +1,55 @@
---- 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.4.8/rpmdb/Makefile.am.orig   2007-02-03 19:58:47.000000000 +0100
++++ rpm-4.4.8/rpmdb/Makefile.am        2007-04-08 16:41:48.380367607 +0200
+@@ -25,21 +25,17 @@
+ 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
+ pkgbindir = @USRLIBRPM@
+-pkgbin_PROGRAMS = \
+-      rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump \
+-      rpmdb_hotbackup rpmdb_load rpmdb_printlog rpmdb_recover \
+-      rpmdb_svc rpmdb_stat rpmdb_upgrade rpmdb_verify 
  
  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 =
+ 
+ # 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)
+@@ -56,16 +52,13 @@
+       @WITH_POPT_LIB@ \
+       @WITH_SQLITE3_LIB@ \
+       @WITH_LIBELF_LIB@
+-librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la)
++librpmdb_la_LIBADD = $(DBLIBOBJS) -ldb
+ librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la)
+ 
+ if HAVE_LD_VERSION_SCRIPT
+ librpmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmdb.vers
+ endif
+ 
+-# XXX make sure that db.h symlink is generated
+-dbconfig.c $(DBLIBSRCS): db.h
+-
+ dbconfig.o: $(top_srcdir)/dbconfig.c
+       $(COMPILE) -o $@ -c $<
  
- 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)