X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-system_libs.patch;h=771130236171fd1215d5f0f9bd8265ecd9447296;hb=62238cf9f9341cdb4c3d45ec5b0888991ae4b9ab;hp=be00c10efc85cfd598a0fccb6c4831a6143f741d;hpb=6efed78b9da75bcfc4487f732e75f7db061a48df;p=packages%2Frpm.git

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
index be00c10..7711302 100644
--- a/rpm-system_libs.patch
+++ b/rpm-system_libs.patch
@@ -1,43 +1,35 @@
-diff -urN rpm.org/configure.ac rpm/configure.ac
---- rpm.org/configure.ac	2004-06-14 11:46:10.220092656 +0200
-+++ rpm/configure.ac	2004-06-14 11:47:13.499472728 +0200
+--- 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(popt zlib file sqlite db3)
-+AC_CONFIG_SUBDIRS(file)
++AC_CONFIG_SUBDIRS(file db3)
  
  AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
  	scripts/perl.req scripts/perl.prov
-@@ -1227,7 +1239,7 @@
- 	python/rpmdb/test/Makefile
+@@ -1534,7 +1534,6 @@
   	lua/Makefile
    ])
--AC_CONFIG_COMMANDS([default],[[	echo timestamp > popt/stamp-h.in
-+AC_CONFIG_COMMANDS([default],[[	
+ AC_CONFIG_COMMANDS([default],[[
+-	[ -d popt ] && echo timestamp > popt/stamp-h.in
  	echo timestamp > stamp-h.in
+ 	[ -d perl ] && cd perl && perl Makefile.PL INSTALLDIRS=vendor
    
- ]],[[]])
-diff -urN rpm.org/Makefile.am rpm/Makefile.am
---- rpm.org/Makefile.am	2004-06-14 11:46:04.409975928 +0200
-+++ rpm/Makefile.am	2004-06-14 11:48:04.236759488 +0200
-@@ -107,7 +106,6 @@
+--- rpm-4.5/Makefile.am~	2008-04-13 03:20:07.000000000 +0300
++++ rpm-4.5/Makefile.am	2008-04-13 03:24:33.962259478 +0300
+@@ -72,7 +72,6 @@
  	    -load lib/rpmlib.lcd \
  	    -load rpmdb/rpmdb.lcd \
  	    -load rpmio/rpmio.lcd \
 -	    -load popt/popt.lcd \
- 		$(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES)
+ 		$(DEFS) $(INCLUDES) rpmqv.c $(rpmbuild_SOURCES)
  
  .PHONY:	lint
 --- rpm.org/rpmio/Makefile.am.org	2004-11-18 17:42:53.756263795 +0100
 +++ rpm.org/rpmio/Makefile.am	2004-11-18 17:43:09.526885309 +0100
-@@ -71,47 +71,47 @@
- tax_LDADD = librpmio.la
- 
- tdigest_SOURCES = tdigest.c
--tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt
-+tdigest_LDADD = librpmio.la -lpopt -lgcrypt
+@@ -82,39 +82,39 @@
  
  tdir_SOURCES = tdir.c
  tdir_LDFLAGS = @LDFLAGS_STATIC@
@@ -80,14 +72,10 @@ diff -urN rpm.org/Makefile.am rpm/Makefile.am
 -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
 +tkey_LDADD = librpmio.la -lpopt
  
- tring_SOURCES = tring.c
- tring_LDFLAGS = @LDFLAGS_STATIC@
--tring_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_LDADD = librpmio.la -lpopt
- 
  trpmio_SOURCES = trpmio.c
 -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
 +trpmio_LDADD = librpmio.la -lpopt
  
  tsw_SOURCES = tsw.c
  tsw_LDFLAGS = librpmio.la
+