From 13e787b0aa65d0a6d61b88efeb31e792c74077be Mon Sep 17 00:00:00 2001 From: Artur Frysiak Date: Sun, 18 May 2003 00:29:30 +0000 Subject: [PATCH] - updated to 4.3.20030515 Changed files: rpm-gettext0.11.patch -> 1.5 rpm-noexpand.patch -> 1.4 rpm-python-fix.patch -> 1.2 rpm-system_libs.patch -> 1.6 --- rpm-gettext0.11.patch | 17 +++++---- rpm-noexpand.patch | 40 ++++++++++---------- rpm-python-fix.patch | 44 +++++++++++----------- rpm-system_libs.patch | 87 +++++++++++++++++++++---------------------- 4 files changed, 94 insertions(+), 94 deletions(-) diff --git a/rpm-gettext0.11.patch b/rpm-gettext0.11.patch index a643220..0ff4a23 100644 --- a/rpm-gettext0.11.patch +++ b/rpm-gettext0.11.patch @@ -1,6 +1,6 @@ ---- rpm-4.2/po/fr.po.wiget Wed Mar 19 18:18:08 2003 -+++ rpm-4.2/po/fr.po Thu Mar 27 19:16:47 2003 -@@ -2,17 +2,16 @@ +--- rpm-4.3/po/fr.po.wiget Thu May 15 18:59:19 2003 ++++ rpm-4.3/po/fr.po Fri May 16 00:11:12 2003 +@@ -2,17 +2,17 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. # @@ -8,27 +8,28 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2003-03-14 12:49-0500\n" + "POT-Creation-Date: 2003-05-15 18:53+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2003-03-12 14:47+0200\n" -+"Last-Translator: unknow \n" ++"Last-Translator: fr \n" +"Language-Team: fr \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" ++ #: build.c:40 #, fuzzy ---- rpm-4.2/po/pt_BR.po.wiget Wed Mar 19 18:18:11 2003 -+++ rpm-4.2/po/pt_BR.po Thu Mar 27 19:17:20 2003 +--- rpm-4.3/po/pt_BR.po.wiget Thu May 15 18:59:21 2003 ++++ rpm-4.3/po/pt_BR.po Fri May 16 00:12:02 2003 @@ -5,6 +5,9 @@ msgstr "" "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2003-03-14 12:49-0500\n" + "POT-Creation-Date: 2003-05-15 18:53+0200\n" +"PO-Revision-Date: 2003-03-12 14:47+0200\n" +"Last-Translator: Arnaldo Carvalho de Melo \n" +"Language-Team: pt \n" diff --git a/rpm-noexpand.patch b/rpm-noexpand.patch index 9da6500..7d6edc0 100644 --- a/rpm-noexpand.patch +++ b/rpm-noexpand.patch @@ -1,6 +1,6 @@ ---- rpm-4.0.4/build/parseChangelog.c.wiget Sat Jan 5 19:40:22 2002 -+++ rpm-4.0.4/build/parseChangelog.c Tue Feb 12 22:52:02 2002 -@@ -217,7 +217,7 @@ +--- rpm-4.3/build/parseChangelog.c.wiget Tue Jun 25 16:52:52 2002 ++++ rpm-4.3/build/parseChangelog.c Fri May 16 00:06:47 2003 +@@ -221,7 +221,7 @@ while (! (nextPart = isPart(spec->line))) { appendStringBuf(sb, spec->line); @@ -9,34 +9,34 @@ nextPart = PART_NONE; break; } ---- rpm-4.0.4/build/parseSpec.c.wiget Sun Jan 20 22:03:52 2002 -+++ rpm-4.0.4/build/parseSpec.c Tue Feb 12 23:02:16 2002 -@@ -143,12 +143,16 @@ +--- rpm-4.3/build/parseSpec.c.wiget Thu May 15 18:15:51 2003 ++++ rpm-4.3/build/parseSpec.c Fri May 16 00:08:57 2003 +@@ -156,12 +156,16 @@ ofi->readPtr = from; /* Don't expand macros (eg. %define) in false branch of %if clause */ + /* Also don't expand macros in %changelog where we set STRIP_NOEXPAND flag */ + /* (first line is ommited, so if there is e.g. %date macro, it will be expanded */ + if (!(strip & STRIP_NOEXPAND)) { - if (spec->readStack->reading && - expandMacros(spec, spec->macros, spec->lbuf, sizeof(spec->lbuf))) { - rpmError(RPMERR_BADSPEC, _("line %d: %s\n"), - spec->lineNum, spec->lbuf); - return RPMERR_BADSPEC; - } + if (spec->readStack->reading && + expandMacros(spec, spec->macros, spec->lbuf, sizeof(spec->lbuf))) { + rpmError(RPMERR_BADSPEC, _("line %d: %s\n"), + spec->lineNum, spec->lbuf); + return RPMERR_BADSPEC; + } + } spec->nextline = spec->lbuf; } -@@ -258,6 +262,7 @@ +@@ -273,6 +277,7 @@ SKIPSPACE(s); match = -1; + if (! (strip & STRIP_NOEXPAND)) { - if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) { - const char *arch = rpmExpand("%{_target_cpu}", NULL); - s += 7; -@@ -337,6 +342,7 @@ + if (!spec->readStack->reading && !strncmp("%if", s, sizeof("%if")-1)) { + match = 0; + } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) { +@@ -354,6 +359,7 @@ ofi = spec->fileStack; goto retry; } @@ -44,9 +44,9 @@ if (match != -1) { rl = xmalloc(sizeof(*rl)); ---- rpm-4.0.4/build/rpmbuild.h.wiget Sun Jan 20 22:17:36 2002 -+++ rpm-4.0.4/build/rpmbuild.h Tue Feb 12 22:52:02 2002 -@@ -73,6 +73,7 @@ +--- rpm-4.3/build/rpmbuild.h.wiget Sat May 10 17:19:33 2003 ++++ rpm-4.3/build/rpmbuild.h Fri May 16 00:06:47 2003 +@@ -75,6 +75,7 @@ #define STRIP_NOTHING 0 #define STRIP_TRAILINGSPACE (1 << 0) #define STRIP_COMMENTS (1 << 1) diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch index 80036c3..e6b30d7 100644 --- a/rpm-python-fix.patch +++ b/rpm-python-fix.patch @@ -1,6 +1,6 @@ ---- rpm-4.2/python/Makefile.am.wiget Wed Jan 8 23:33:12 2003 -+++ rpm-4.2/python/Makefile.am Thu Apr 3 15:52:29 2003 -@@ -28,45 +28,36 @@ +--- rpm-4.3/python/Makefile.am.wiget Tue May 6 17:44:12 2003 ++++ rpm-4.3/python/Makefile.am Fri May 16 00:32:43 2003 +@@ -29,30 +29,31 @@ rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h mylibs= \ @@ -9,24 +9,34 @@ - $(top_builddir)/rpmio/.libs/librpmio.so \ - $(top_builddir)/popt/.libs/libpopt.so \ + $(top_builddir)/lib/librpm.la \ -+ $(top_builddir)/rpmdb/librpmdb.la \ -+ $(top_builddir)/rpmio/librpmio.la \ -+ -lpopt \ ++ $(top_builddir)/rpmdb/librpmdb.la \ ++ $(top_builddir)/rpmio/librpmio.la \ ++ -lpopt \ @WITH_LIBELF_LIB@ LDADD = pythondir = $(pylibdir)/site-packages -python_PROGRAMS = rpmmodule.so ++python_LTLIBRARIES = rpmmodule.la poptmodule.la rpmdbdir = $(pylibdir)/site-packages/rpmdb -rpmdb_PROGRAMS = _rpmdb.so +rpmdb_LTLIBRARIES = _rpmdb.la -noinst_PROGRAMS = poptmodule.so +- +-rpmmodule_so_SOURCES = +-rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so +- +-_rpmdb_so_SOURCES = _rpmdb.c +-_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so +- +-poptmodule_so_SOURCES = poptmodule.c +-poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so +rpmmodule_la_SOURCES = -+rpmmodule_la_LIBADD = $(mylibs) $(LIBS) -+rpmmodule_la_LDFLAGS = -module -avoid-version ++rpmmodule_la_LIBADD = $(mylibs) $(LIBS) ++rpmmodule_la_LDFLAGS = -module -avoid-version + +_rpmdb_la_SOURCES = _rpmdb.c +_rpmdb_la_LIBADD = $(mylibs) $(LIBS) @@ -36,20 +46,10 @@ +poptmodule_la_LIBADD = $(mylibs) $(LIBS) +poptmodule_la_LDFLAGS = -module -avoid-version --rpmmodule_so_SOURCES = --rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so -- --_rpmdb_so_SOURCES = _rpmdb.c --_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so -- --poptmodule_so_SOURCES = poptmodule.c --poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so -- --noinst_LTLIBRARIES = librpmmodule.la --librpmmodule_la_SOURCES = rpmmodule.c header-py.c \ -+python_LTLIBRARIES = rpmmodule.la poptmodule.la -+rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ - rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ + noinst_LTLIBRARIES = librpmmodule.la + librpmmodule_la_SOURCES = rpmmodule.c header-py.c \ +@@ -60,15 +61,6 @@ + rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c -rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch index 8e8463c..653691b 100644 --- a/rpm-system_libs.patch +++ b/rpm-system_libs.patch @@ -1,11 +1,11 @@ ---- rpm-4.2/rpmio/Makefile.am.wiget Thu Mar 27 23:16:15 2003 -+++ rpm-4.2/rpmio/Makefile.am Thu Mar 27 23:16:15 2003 +--- rpm-4.3/rpmio/Makefile.am.wiget Fri May 16 00:16:34 2003 ++++ rpm-4.3/rpmio/Makefile.am Fri May 16 00:18:17 2003 @@ -70,34 +70,34 @@ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) tdigest_SOURCES = tdigest.c --tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -+tdigest_LDADD = librpmio.la -lpopt +-tdigest_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -lgcrypt ++tdigest_LDADD = librpmio.la -lpopt -lgcrypt tdir_SOURCES = tdir.c tdir_LDFLAGS = -all-static @@ -41,12 +41,33 @@ -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = librpmio.la -lpopt - dumpasn1_SOURCES = dumpasn1.c + tsw_SOURCES = tsw.c + tsw_LDFLAGS = librpmio.la +--- rpm-4.3/rpmdb/Makefile.am.wiget Tue Mar 25 13:49:44 2003 ++++ rpm-4.3/rpmdb/Makefile.am Fri May 16 00:16:34 2003 +@@ -49,7 +49,7 @@ + tagname.c tagtbl.c + librpmdb_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la \ ++ @WITH_POPT_LIB@ \ + @WITH_LIBELF_LIB@ \ + @libdb3@ + librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) +--- rpm-4.3/lib/Makefile.am.wiget Tue Apr 8 18:38:08 2003 ++++ rpm-4.3/lib/Makefile.am Fri May 16 00:16:34 2003 +@@ -39,7 +39,7 @@ + librpm_la_LDFLAGS = -release @VERSION@ $(LDFLAGS) \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la ++ @WITH_POPT_LIB@ - ---- rpm-4.2/tools/Makefile.am.wiget Fri Mar 7 19:21:19 2003 -+++ rpm-4.2/tools/Makefile.am Thu Mar 27 23:23:19 2003 -@@ -37,7 +37,7 @@ + getdate.c: getdate.y + @echo expect 10 shift/reduce conflicts +--- rpm-4.3/tools/Makefile.am.wiget Thu Apr 17 18:45:19 2003 ++++ rpm-4.3/tools/Makefile.am Fri May 16 00:16:34 2003 +@@ -39,7 +39,7 @@ debugedit_SOURCES = debugedit.c hashtab.c debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ @@ -55,9 +76,9 @@ javadeps_SOURCES = javadeps.c ---- rpm-4.2/configure.ac.wiget Thu Mar 27 23:16:15 2003 -+++ rpm-4.2/configure.ac Thu Mar 27 23:58:46 2003 -@@ -407,6 +407,17 @@ +--- rpm-4.3/configure.ac.wiget Fri May 16 00:16:34 2003 ++++ rpm-4.3/configure.ac Fri May 16 00:16:44 2003 +@@ -410,6 +410,17 @@ ]) AC_SUBST(WITH_LIBDWARF_INCLUDE) @@ -75,7 +96,7 @@ AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) ]) -@@ -465,6 +474,7 @@ +@@ -470,6 +481,7 @@ dnl Check for Berkeley db3 API. AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], @@ -83,7 +104,7 @@ AC_CHECK_LIB(db-3.2, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.2"], AC_CHECK_LIB(db-3.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.1"], AC_CHECK_LIB(db-3.0, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-3.0"], -@@ -473,6 +483,7 @@ +@@ -478,6 +490,7 @@ ) ) ) @@ -91,7 +112,7 @@ ) if test X"$DBLIBSRCS" = X; then -@@ -1226,7 +1237,7 @@ +@@ -1236,7 +1249,7 @@ dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE @@ -99,18 +120,18 @@ +AC_CONFIG_SUBDIRS(beecrypt file) AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec - macros.perl scripts/perl.req scripts/perl.prov -@@ -1248,7 +1259,7 @@ - python/Makefile - python/rpmdb/Makefile - python/test/Makefile + scripts/perl.req scripts/perl.prov +@@ -1260,7 +1273,7 @@ + python/rpmdb/test/Makefile + python/mpw/Makefile + python/mpw/test/Makefile - ], [ echo timestamp > popt/stamp-h.in + ], [ echo timestamp > beecrypt/stamp-h.in echo timestamp > stamp-h.in ] ---- rpm-4.2/Makefile.am.wiget Mon Mar 10 20:35:20 2003 -+++ rpm-4.2/Makefile.am Thu Mar 27 23:50:55 2003 +--- rpm-4.3/Makefile.am.wiget Mon May 5 10:44:39 2003 ++++ rpm-4.3/Makefile.am Fri May 16 00:16:34 2003 @@ -14,7 +14,7 @@ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c @@ -137,25 +158,3 @@ $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) .PHONY: lint ---- rpm-4.2/rpmdb/Makefile.am.syslib Fri Mar 28 00:45:58 2003 -+++ rpm-4.2/rpmdb/Makefile.am Fri Mar 28 00:48:00 2003 -@@ -49,7 +49,7 @@ - tagname.c tagtbl.c - librpmdb_la_LDFLAGS = -release @VERSION@ \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la \ -+ @WITH_POPT_LIB@ \ - @WITH_LIBELF_LIB@ \ - @libdb3@ - librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) ---- rpm-4.2/lib/Makefile.am.wiget Fri Mar 28 01:31:52 2003 -+++ rpm-4.2/lib/Makefile.am Fri Mar 28 01:32:37 2003 -@@ -39,7 +39,7 @@ - librpm_la_LDFLAGS = -release @VERSION@ \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la -+ @WITH_POPT_LIB@ - - getdate.c: getdate.y - @echo expect 10 shift/reduce conflicts -- 2.44.0