- rpm.org RPM, merged from PLD

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

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
deleted file mode 100644 (file)
index 7711302..0000000
--- a/rpm-system_libs.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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 db3)
- 
- AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
-       scripts/perl.req scripts/perl.prov
-@@ -1534,7 +1534,6 @@
-       lua/Makefile
-   ])
- 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
-   
---- 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 $(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
-@@ -82,39 +82,39 @@
- 
- tdir_SOURCES = tdir.c
- tdir_LDFLAGS = @LDFLAGS_STATIC@
--tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tdir_LDADD = librpmio.la -lpopt
- 
- tfts_SOURCES = tfts.c
- tfts_LDFLAGS = @LDFLAGS_STATIC@
--tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tfts_LDADD = librpmio.la -lpopt
- 
- tget_SOURCES = tget.c
- tget_LDFLAGS = @LDFLAGS_STATIC@
--tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tget_LDADD = librpmio.la -lpopt
- 
- thkp_SOURCES = thkp.c
- thkp_LDFLAGS = @LDFLAGS_STATIC@
--thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+thkp_LDADD = librpmio.la -lpopt
- 
- tput_SOURCES = tput.c
- tput_LDFLAGS = @LDFLAGS_STATIC@
--tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tput_LDADD = librpmio.la -lpopt
- 
- 
- tglob_SOURCES = tglob.c
- tglob_LDFLAGS = @LDFLAGS_STATIC@
--tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tglob_LDADD = librpmio.la -lpopt
- 
- tinv_SOURCES = tinv.c
- tinv_LDFLAGS = @LDFLAGS_STATIC@
--tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tinv_LDADD = librpmio.la -lpopt
- 
- tkey_SOURCES = tkey.c
- tkey_LDFLAGS = @LDFLAGS_STATIC@
--tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_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
-