*** empty log message ***

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

diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch
index 1ce5a7a2cd0b3487d06174358905efe0ad9b5f57..26ce20eb7495eadcb6a47f9c858417359db2c21e 100644 (file)
--- a/rpm-system_libs.patch
+++ b/rpm-system_libs.patch
@@ -19,28 +19,6 @@ diff -urN rpm.org/configure.ac rpm/configure.ac
        echo timestamp > stamp-h.in
    
  ]],[[]])
---- rpm-4.4.2/lib/Makefile.am.orig     2005-02-17 01:14:40.000000000 +0100
-+++ rpm-4.4.2/lib/Makefile.am  2005-07-23 13:32:57.886832096 +0200
-@@ -98,7 +98,7 @@
-       $(LINK) @LDFLAGS_STATIC@ $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
-       -lselinux \
-       $(top_builddir)/rpmio/librpmio.la \
--      $(top_builddir)/popt/libpopt.la
-+      -lpopt
-       
- #tds: tds.c librpm.la
- #     $(CC) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs)
-@@ -109,8 +109,8 @@
- tthread: tthread.o librpm.la
-       $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(mylibs) @WITH_LIBELF_LIB@
- 
--tsystem: tsystem.o $(top_builddir)/popt/libpopt.la
--      $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la
-+tsystem: tsystem.o
-+      $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< $(top_builddir)/rpmio/librpmio.la -lpopt
- 
- tre: tre.o librpm.la
-       $(LINK) $(CFLAGS) $(DEFS) $(INCLUDES) -o $@ $< \
 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
@@ -54,12 +32,7 @@ diff -urN rpm.org/Makefile.am rpm/Makefile.am
  .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@
@@ -102,14 +75,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
+