- fixed (finally?) GConf scripts, rel 0.6

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

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index 0b96381f5a27f072cbdf1501c54cad897cdfcbde..983783091a94b01a62b25917ef09cffbc8cbbfc8 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -1,39 +1,43 @@
---- 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 @@
+diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am
+--- rpm-4.3.org/Makefile.am    2003-12-28 01:33:43.917858224 +0100
++++ rpm-4.3/Makefile.am        2003-12-28 02:01:02.060822640 +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@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @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 @@
  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
+-pkgbin_PROGRAMS = \
+-      rpmdb_archive rpmdb_checkpoint rpmdb_deadlock rpmdb_dump 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
- 
- 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)
+ 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)
+@@ -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