SOURCES (AC-branch): rpm-system_libs-more.patch - merged from HEAD

[baggins]

Author: baggins                      Date: Fri Jun 17 14:41:27 2005 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   rpm-system_libs-more.patch (1.3 -> 1.3.4.1) 

---- Diffs:

================================================================
Index: SOURCES/rpm-system_libs-more.patch
diff -u SOURCES/rpm-system_libs-more.patch:1.3 SOURCES/rpm-system_libs-more.patch:1.3.4.1
--- SOURCES/rpm-system_libs-more.patch:1.3	Sun Dec 28 02:40:21 2003
+++ SOURCES/rpm-system_libs-more.patch	Fri Jun 17 16:41:22 2005
@@ -5,25 +5,22 @@
  	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@  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@  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@ 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,18 +25,15 @@
+@@ -25,17 +25,13 @@
  noinst_HEADERS = fprint.h header_internal.h legacy.h
  
  pkgbindir = @RPMCONFIGDIR@
 -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
-+pkgbin_PROGRAMS =
-+noinst_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
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-system_libs-more.patch?r1=1.3&r2=1.3.4.1&f=u