SOURCES: rpm-lzma2.patch, rpm-magic-usesystem.patch, rpm-old-filec...

arekm arekm at pld-linux.org
Tue Oct 17 20:59:55 CEST 2006


Author: arekm                        Date: Tue Oct 17 18:59:55 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update for 4.4.7

---- Files affected:
SOURCES:
   rpm-lzma2.patch (1.5 -> 1.6) , rpm-magic-usesystem.patch (1.7 -> 1.8) , rpm-old-fileconflicts-behaviour.patch (1.1 -> 1.2) , rpm-provides-dont-obsolete.patch (1.1 -> 1.2) , rpm-rpmpopt.patch (1.21 -> 1.22) , rpm-rpmrc.patch (1.36 -> 1.37) , rpm-skip-backups.patch (1.1 -> 1.2) , rpm-system_libs-more.patch (1.7 -> 1.8) , rpm-system_libs.patch (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SOURCES/rpm-lzma2.patch
diff -u SOURCES/rpm-lzma2.patch:1.5 SOURCES/rpm-lzma2.patch:1.6
--- SOURCES/rpm-lzma2.patch:1.5	Sat May 27 14:12:52 2006
+++ SOURCES/rpm-lzma2.patch	Tue Oct 17 20:59:49 2006
@@ -36,9 +36,9 @@
 +    { "rpmlib(PayloadIsLzma)",		"4.4.6-1",
 +	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
 +    N_("package payload can be compressed using lzma.") },
-     { NULL,				NULL, 0,	NULL }
- };
- 
+     { "rpmlib(FileDigestParameterized)",    "4.4.6-1",
+         (RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
+     N_("file digests can be other than MD5.") },
 diff -Nru rpm-4.4.5.old/rpm2cpio.c rpm-4.4.5/rpm2cpio.c
 --- rpm-4.4.5.old/rpm2cpio.c	2005-01-17 19:46:16.000000000 +0100
 +++ rpm-4.4.5/rpm2cpio.c	2006-04-22 17:18:55.000000000 +0200
@@ -65,23 +65,25 @@
 diff -Nru rpm-4.4.5.old/rpmio/Makefile.am rpm-4.4.5/rpmio/Makefile.am
 --- rpm-4.4.5.old/rpmio/Makefile.am	2006-04-22 15:02:56.000000000 +0200
 +++ rpm-4.4.5/rpmio/Makefile.am	2006-04-23 13:31:09.000000000 +0200
-@@ -22,14 +22,14 @@
- 	argv.h fts.h rmd128.h rmd160.h rpmdav.h \
+@@ -24,7 +24,7 @@
  	rpmio.h rpmurl.h rpmmacro.h rpmlog.h rpmmessages.h rpmerr.h rpmpgp.h \
  	rpmsq.h rpmsw.h ugid.h
--noinst_HEADERS = rpmio_internal.h rpmlua.h rpmhook.h
-+noinst_HEADERS = LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h
+ noinst_HEADERS = md2.h md4.h rmd128.h rmd160.h tiger.h \
+-	rpmio_internal.h rpmlua.h rpmhook.h
++	LzmaDecode.h rpmio_internal.h rpmlua.h rpmhook.h
  
  BEECRYPTLOBJS = $(shell test X"@WITH_BEECRYPT_SUBDIR@" != X && cat $(top_builddir)/@WITH_BEECTYPT_SUBDIR@/listobjs)
  
- usrlibdir = $(libdir)@MARK64@
- usrlib_LTLIBRARIES = librpmio.la
- librpmio_la_SOURCES = \
--	argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \
-+	LzmaDecode.c argv.c digest.c fts.c macro.c rmd128.c rmd160.c rpmdav.c \
- 	rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
+@@ -34,7 +34,8 @@
+ 	argv.c digest.c fts.c macro.c md2.c md4.c rmd128.c rmd160.c tiger.c \
+ 	rpmdav.c rpmhook.c rpmio.c rpmlog.c rpmlua.c rpmmalloc.c \
  	rpmpgp.c rpmrpc.c rpmsq.c rpmsw.c strcasecmp.c strtolocale.c \
- 	stubs.c url.c ugid.c
+-	stubs.c url.c ugid.c
++	stubs.c url.c ugid.c \
++	LzmaDecode.c
+ librpmio_la_LDFLAGS = -no-undefined -release $(LT_CURRENT).$(LT_REVISION) $(LDFLAGS) \
+ 	@WITH_BEECRYPT_LIB@ \
+ 	@WITH_NEON_LIB@ \
 diff -Nru rpm-4.4.5.old/rpmio/rpmio.c rpm-4.4.5/rpmio/rpmio.c
 --- rpm-4.4.5.old/rpmio/rpmio.c	2006-04-22 15:02:55.000000000 +0200
 +++ rpm-4.4.5/rpmio/rpmio.c	2006-04-23 14:43:10.000000000 +0200

================================================================
Index: SOURCES/rpm-magic-usesystem.patch
diff -u SOURCES/rpm-magic-usesystem.patch:1.7 SOURCES/rpm-magic-usesystem.patch:1.8
--- SOURCES/rpm-magic-usesystem.patch:1.7	Sat Sep  3 16:40:54 2005
+++ SOURCES/rpm-magic-usesystem.patch	Tue Oct 17 20:59:50 2006
@@ -1,14 +1,3 @@
---- rpm/build/rpmfc.c.orig	2004-11-22 11:39:55.000000000 +0100
-+++ rpm/build/rpmfc.c	2004-11-22 18:09:14.400710096 +0100
-@@ -1432,7 +1432,7 @@
-     int fcolor;
-     int xx;
- /*@observer@*/
--    static const char * magicfile = "/usr/lib/rpm/magic";
-+    static const char * magicfile = "/usr/share/file/magic";
-     int msflags = MAGIC_CHECK;	/* XXX MAGIC_COMPRESS flag? */
-     magic_t ms = NULL;
- 
 diff -ur rpm.org/file/doc/Makefile.am rpm/file/doc/Makefile.am
 --- rpm.org/file/doc/Makefile.am	2004-11-18 15:04:33.000000000 +0100
 +++ rpm/file/doc/Makefile.am	2004-11-22 01:02:30.114807597 +0100
@@ -18,7 +7,6 @@
  if FSECT5
  man_MAGIC = magic.5
  else
-Tylko w rpm/file/doc: Makefile.am~
 diff -ur rpm.org/file/Makefile.am rpm/file/Makefile.am
 --- rpm.org/file/Makefile.am	2004-11-18 15:04:32.000000000 +0100
 +++ rpm/file/Makefile.am	2004-11-22 01:01:36.817958788 +0100
@@ -28,7 +16,6 @@
  
 -SUBDIRS = src magic doc python
 +SUBDIRS = src magic python
-Tylko w rpm/file: Makefile.am.orig
 diff -ur rpm.org/file/src/Makefile.am rpm/file/src/Makefile.am
 --- rpm.org/file/src/Makefile.am	2004-11-18 15:04:33.000000000 +0100
 +++ rpm/file/src/Makefile.am	2004-11-22 01:01:36.823963503 +0100
@@ -45,13 +32,13 @@
 --- rpm.org/tools/Makefile.am	2004-11-22 00:56:22.484205000 +0100
 +++ rpm/tools/Makefile.am	2004-11-22 01:03:05.178339563 +0100
 @@ -30,7 +30,7 @@
- 
  pkgbindir = @RPMCONFIGDIR@
- pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
+ pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
+ 	rpmcache rpmdeps rpmfile
 -MAGIC	= $(pkgbindir)/magic
 +MAGIC	= /usr/share/file/magic
  
- bin_PROGRAMS =	rpmgraph
+ bin_PROGRAMS =	 rpmdigest rpmgraph
  
 diff -urbB rpm-4.4.2.org/tools/Makefile.am rpm-4.4.2/tools/Makefile.am
 --- rpm-4.4.2.org/tools/Makefile.am	2005-09-03 16:35:22.169432000 +0200
@@ -60,8 +47,9 @@
  noinst_PROGRAMS = dumpdb
  
  pkgbindir = @RPMCONFIGDIR@
--pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
-+pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps @WITH_RPMFILE@
+ pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps \
+-	rpmcache rpmdeps rpmfile
++	rpmcache rpmdeps @WITH_RPMFILE@
  MAGIC	= /usr/share/file/magic
  
- bin_PROGRAMS =	rpmgraph
+ bin_PROGRAMS =	 rpmdigest rpmgraph

================================================================
Index: SOURCES/rpm-old-fileconflicts-behaviour.patch
diff -u SOURCES/rpm-old-fileconflicts-behaviour.patch:1.1 SOURCES/rpm-old-fileconflicts-behaviour.patch:1.2
--- SOURCES/rpm-old-fileconflicts-behaviour.patch:1.1	Wed Dec 28 04:06:11 2005
+++ SOURCES/rpm-old-fileconflicts-behaviour.patch	Tue Oct 17 20:59:50 2006
@@ -1,15 +1,14 @@
 --- rpm-4.4.4/lib/poptI.c.orig	2005-11-27 13:50:16.000000000 +0000
 +++ rpm-4.4.4/lib/poptI.c	2005-12-28 02:43:01.029574304 +0000
-@@ -16,8 +16,7 @@
+@@ -16,7 +16,7 @@
+ /*@-fullinitblock@*/
  /*@unchecked@*/
- struct rpmInstallArguments_s rpmIArgs = {
-     0,			/* transFlags */
--			/* probFilter */
--    (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
-+    0,			/* probFilter */
-     0,			/* installInterfaceFlags */
-     0,			/* eraseInterfaceFlags */
-     0,			/* qva_flags */
+ struct rpmQVKArguments_s rpmIArgs = {
+-    .probFilter = (RPMPROB_FILTER_REPLACEOLDFILES | RPMPROB_FILTER_REPLACENEWFILES),
++    .probFilter = 0,
+ };
+ /*@=fullinitblock@*/
+ 
 @@ -274,9 +273,6 @@
  	N_("skip files with leading component <path> "),
  	N_("<path>") },

================================================================
Index: SOURCES/rpm-provides-dont-obsolete.patch
diff -u SOURCES/rpm-provides-dont-obsolete.patch:1.1 SOURCES/rpm-provides-dont-obsolete.patch:1.2
--- SOURCES/rpm-provides-dont-obsolete.patch:1.1	Sun Jun 29 02:15:49 2003
+++ SOURCES/rpm-provides-dont-obsolete.patch	Tue Oct 17 20:59:50 2006
@@ -1,15 +1,17 @@
 --- rpm-4.3/lib/depends.c.orig	2003-05-15 18:16:51.000000000 +0200
 +++ rpm-4.3/lib/depends.c	2003-06-29 00:17:42.000000000 +0200
-@@ -254,7 +254,11 @@
+@@ -343,8 +343,12 @@
  
      /* On upgrade, erase older packages of same color (if any). */
  
--    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0);
 +    /* NOTE: in PLD we don't want to remove packages which only provided
 +     * %{name} (e.g. perl-modules in case of some newer perl modules),
 +     * so we use NAME instead of PROVIDENAME (as in vanilla rpm) here */
 +
+   if (!(depFlags & RPMDEPS_FLAG_NOUPGRADE)) {
+-    mi = rpmtsInitIterator(ts, RPMTAG_PROVIDENAME, rpmteN(p), 0);
 +    mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(p), 0);
      while((oh = rpmdbNextIterator(mi)) != NULL) {
- 
- 	/* Ignore colored packages not in our rainbow. */
+ 	int lastx;
+ 	rpmte q;
+

================================================================
Index: SOURCES/rpm-rpmpopt.patch
diff -u SOURCES/rpm-rpmpopt.patch:1.21 SOURCES/rpm-rpmpopt.patch:1.22
--- SOURCES/rpm-rpmpopt.patch:1.21	Wed Dec 14 23:59:11 2005
+++ SOURCES/rpm-rpmpopt.patch	Tue Oct 17 20:59:50 2006
@@ -17,9 +17,9 @@
  rpmbuild	alias --dbpath		--define '_dbpath !#:+' \
  	--POPTdesc=$"use database in DIRECTORY" \
 @@ -261,6 +270,15 @@
- rpmbuild alias --without	--define "_without_!#:+  --without-!#:+" \
- 	--POPTdesc=$"disable configure <option> for build" \
- 	--POPTargs=$"<option>"
+ rpmbuild alias --buildroot      --define '.buildroot !#:+' \
+ 	--POPTdesc=$"override build root" \
+ 	--POPTargs=$"DIRECTORY"
 +# (PLD-specific) Make RPM build tree
 +rpmbuild exec --install-build-tree install-build-tree \
 +	--POPTdesc=$"make all needed dirs for building binary rpms"

================================================================
Index: SOURCES/rpm-rpmrc.patch
diff -u SOURCES/rpm-rpmrc.patch:1.36 SOURCES/rpm-rpmrc.patch:1.37
--- SOURCES/rpm-rpmrc.patch:1.36	Fri May  5 14:06:48 2006
+++ SOURCES/rpm-rpmrc.patch	Tue Oct 17 20:59:50 2006
@@ -1,23 +1,23 @@
 --- rpm-4.4.3/rpmrc.in.orig	2005-10-26 03:01:40.000000000 +0200
 +++ rpm-4.4.3/rpmrc.in	2005-11-18 19:24:50.519967824 +0100
-@@ -13,67 +13,67 @@
+@@ -13,69 +13,67 @@
  # Values for RPM_OPT_FLAGS for various platforms
  
  # "fat" binary with both archs, for Darwin
 -optflags: fat -O2 -g -arch i386 -arch ppc
 +optflags: fat -O2 -arch i386 -arch ppc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_fat: %{specflags_fat}}}
  
--optflags: i386 -O2 -g -march=i386 -mcpu=i686
--optflags: i486 -O2 -g -march=i486
--optflags: i586 -O2 -g -march=i586
--optflags: i686 -O2 -g -march=i686
--optflags: pentium3 -O2 -g -march=pentium3
--optflags: pentium4 -O2 -g -march=pentium4
--optflags: athlon -O2 -g -march=athlon
+-optflags: i386 -O2 -g -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
+-optflags: i486 -O2 -g -m32 -march=i486 -fasynchronous-unwind-tables
+-optflags: i586 -O2 -g -m32 -march=i586 -fasynchronous-unwind-tables
+-optflags: i686 -O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables
+-optflags: pentium3 -O2 -g -m32 -march=pentium3 -fasynchronous-unwind-tables
+-optflags: pentium4 -O2 -g -m32 -march=pentium4 -fasynchronous-unwind-tables
+-optflags: athlon -O2 -g -m32 -march=athlon -fasynchronous-unwind-tables
 -optflags: ia64 -O2 -g
--optflags: x86_64 -O2 -g
--optflags: amd64 -O2 -g
--optflags: ia32e -O2 -g
+-optflags: x86_64 -O2 -g -m64 -mtune=generic
+-optflags: amd64 -O2 -g -m64 -mtune=generic
+-optflags: ia32e -O2 -g -m64 -mtune=generic
 -
 -optflags: alpha -O2 -g -mieee
 -optflags: alphaev5 -O2 -g -mieee -mcpu=ev5
@@ -26,20 +26,22 @@
 -optflags: alphaev6 -O2 -g -mieee -mcpu=ev6
 -optflags: alphaev67 -O2 -g -mieee -mcpu=ev67
 -
--optflags: sparc -O2 -g -m32 -mtune=ultrasparc
--optflags: sparcv8 -O2 -g -m32 -mtune=ultrasparc -mv8
+-optflags: sparc -O2 -g -m32 -mcpu=v7 -mtune=ultrasparc
+-optflags: sparcv8 -O2 -g -m32 -mcpu=v8
 -optflags: sparcv9 -O2 -g -m32 -mcpu=ultrasparc
 -optflags: sparc64 -O2 -g -m64 -mcpu=ultrasparc
 -
 -optflags: m68k -O2 -g -fomit-frame-pointer
 -
--optflags: ppc -O2 -g -fsigned-char
--optflags: ppc8260 -O2 -g -fsigned-char
--optflags: ppc8560 -O2 -g -fsigned-char
--optflags: ppc32dy4 -O2 -g -fsigned-char
--optflags: ppciseries -O2 -g -fsigned-char
--optflags: ppcpseries -O2 -g -fsigned-char
--optflags: ppc64 -O2 -g -fsigned-char
+-optflags: ppc -O2 -g -m32
+-optflags: ppc8260 -O2 -g -m32
+-optflags: ppc8560 -O2 -g -m32
+-optflags: ppc32dy4 -O2 -g -m32
+-optflags: ppciseries -O2 -g -m32
+-optflags: ppcpseries -O2 -g -m32
+-optflags: ppc64 -O2 -g -m64 -mminimal-toc
+-optflags: ppciseries -O2 -g -m64 -mminimal-toc
+-optflags: ppcpseries -O2 -g -m64 -mminimal-toc
 -
 -optflags: parisc -O2 -g -mpa-risc-1-0
 -optflags: hppa1.0 -O2 -g -mpa-risc-1-0
@@ -120,8 +122,8 @@
 +optflags: milan -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}}
 +optflags: hades -O2 -fno-strict-aliasing -fwrapv -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}}
  
--optflags: s390 -O2 -g
--optflags: s390x -O2 -g
+-optflags: s390 -O2 -g -m31
+-optflags: s390x -O2 -g -m64
 +optflags: s390 -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}}
 +optflags: s390x -O2 -fno-strict-aliasing -fwrapv%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}}
  

================================================================
Index: SOURCES/rpm-skip-backups.patch
diff -u SOURCES/rpm-skip-backups.patch:1.1 SOURCES/rpm-skip-backups.patch:1.2
--- SOURCES/rpm-skip-backups.patch:1.1	Wed Apr 26 23:53:39 2006
+++ SOURCES/rpm-skip-backups.patch	Tue Oct 17 20:59:50 2006
@@ -1,11 +1,12 @@
 --- rpm-4.4.2/rpmio/macro.c~	2006-04-27 00:49:59.000000000 +0300
 +++ rpm-4.4.2/rpmio/macro.c	2006-04-27 00:50:04.000000000 +0300
-@@ -2000,8 +2000,15 @@
+@@ -2000,10 +2000,16 @@
  	    continue;
  
  	/* Read macros from each file. */
--	for (i = 0; i < ac; i++)
+-	for (i = 0; i < ac; i++) {
 -	    (void) rpmLoadMacroFile(mc, av[i]);
+-	    av[i] = _free(av[i]);
 +	for (i = 0; i < ac; i++) {
 +	    size_t slen = strlen(av[i]);
 +	    if ((av[i])[slen-1] != '~' &&
@@ -14,7 +15,8 @@
 +			      strcmp((av[i] + slen - 8), ".rpmsave")))) {
 +		(void) rpmLoadMacroFile(mc, av[i]);
 +	    }
-+	}
++	    av[i] = _free(av[i]);
+	}
  	av = _free(av);
      }
      mfiles = _free(mfiles);

================================================================
Index: SOURCES/rpm-system_libs-more.patch
diff -u SOURCES/rpm-system_libs-more.patch:1.7 SOURCES/rpm-system_libs-more.patch:1.8
--- SOURCES/rpm-system_libs-more.patch:1.7	Fri Nov 18 22:53:30 2005
+++ SOURCES/rpm-system_libs-more.patch	Tue Oct 17 20:59:50 2006
@@ -4,8 +4,8 @@
  	po/*.in po/*.po po/rpm.pot \
  	rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
  
--SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
+-SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ @WITH_SYCK_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_SYCK_SUBDIR@ @WITH_LUA_SUBDIR@ rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ @WITH_PERL_SUBDIR@ tools scripts tests doc .
  
  INCLUDES = \
  	-I$(top_srcdir)/build \

================================================================
Index: SOURCES/rpm-system_libs.patch
diff -u SOURCES/rpm-system_libs.patch:1.17 SOURCES/rpm-system_libs.patch:1.18
--- SOURCES/rpm-system_libs.patch:1.17	Mon Apr 17 19:29:33 2006
+++ SOURCES/rpm-system_libs.patch	Tue Oct 17 20:59:50 2006
@@ -32,12 +32,7 @@
  .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 +75,10 @@
 -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
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-lzma2.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-magic-usesystem.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-old-fileconflicts-behaviour.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-provides-dont-obsolete.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-rpmpopt.patch?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-rpmrc.patch?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-skip-backups.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-system_libs-more.patch?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SOURCES/rpm-system_libs.patch?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list