From 0579a2723596085501377303de90ce3c7b028b6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Mon, 14 Jun 2004 12:18:21 +0000 Subject: [PATCH] - started update to 20040614 Changed files: rpm-arch.patch -> 1.6 rpm-pld-autodep.patch -> 1.4 rpm-po.patch -> 1.9 rpm-python-fix.patch -> 1.8 rpm-rpmrc.patch -> 1.21 rpm-system_libs-more.patch -> 1.4 rpm-system_libs.patch -> 1.11 --- rpm-arch.patch | 26 +++-- rpm-pld-autodep.patch | 4 +- rpm-po.patch | 202 ------------------------------------- rpm-python-fix.patch | 27 +++-- rpm-rpmrc.patch | 77 ++++---------- rpm-system_libs-more.patch | 4 +- rpm-system_libs.patch | 56 +++++----- 7 files changed, 80 insertions(+), 316 deletions(-) diff --git a/rpm-arch.patch b/rpm-arch.patch index e49f323..22e325f 100644 --- a/rpm-arch.patch +++ b/rpm-arch.patch @@ -1,28 +1,32 @@ -diff -urN rpm-3.0.5.orig/rpmrc.in rpm-3.0.5/rpmrc.in ---- rpm-3.0.5.orig/rpmrc.in Sat Jul 29 23:56:53 2000 -+++ rpm-3.0.5/rpmrc.in Sun Jul 30 00:03:28 2000 -@@ -120,10 +120,10 @@ - - buildarchtranslate: ia64: ia64 +diff -urN rpm.org/rpmrc.in rpm/rpmrc.in +--- rpm.org/rpmrc.in 2004-06-14 11:41:06.654241680 +0200 ++++ rpm/rpmrc.in 2004-06-14 11:42:26.617085480 +0200 +@@ -231,12 +231,12 @@ + buildarchtranslate: osfmach3_i486: i386 + buildarchtranslate: osfmach3_i386: i386 -buildarchtranslate: athlon: i386 +-buildarchtranslate: pentium4: i386 +-buildarchtranslate: pentium3: i386 -buildarchtranslate: i686: i386 -buildarchtranslate: i586: i386 -buildarchtranslate: i486: i386 +buildarchtranslate: athlon: athlon ++buildarchtranslate: pentium4: pentium4 ++buildarchtranslate: pentium3: pentium3 +buildarchtranslate: i686: i686 +buildarchtranslate: i586: i586 +buildarchtranslate: i486: i486 buildarchtranslate: i386: i386 - buildarchtranslate: osfmach3_ppc: ppc -@@ -134,7 +134,8 @@ - buildarchtranslate: sun4d: sparc + buildarchtranslate: alphaev5: alpha +@@ -250,7 +250,8 @@ buildarchtranslate: sun4m: sparc + buildarchtranslate: sparcv8: sparc buildarchtranslate: sparcv9: sparc -buildarchtranslate: sun4u: sparc64 +buildarchtranslate: sun4u: sparc +buildarchtranslate: sparc64: sparc - buildarchtranslate: atarist: m68kmint - buildarchtranslate: atariste: m68kmint + buildarchtranslate: osfmach3_ppc: ppc + buildarchtranslate: powerpc: ppc diff --git a/rpm-pld-autodep.patch b/rpm-pld-autodep.patch index 61f24fa..1f5eda6 100644 --- a/rpm-pld-autodep.patch +++ b/rpm-pld-autodep.patch @@ -305,8 +305,8 @@ /*@=branchstate =uniondef @*/ /* For DSO's, provide the basename of the file if DT_SONAME not found. */ -- if (!fc->skipProv && isDSO && !gotSONAME) { -+ if (findprov && !fc->skipProv && isDSO && !gotSONAME) { +- if (!fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) { ++ if (findprov && !fc->skipProv && isDSO && !gotDEBUG && !gotSONAME) { depsp = &fc->provides; tagN = RPMTAG_PROVIDENAME; dsContext = RPMSENSE_FIND_PROVIDES; diff --git a/rpm-po.patch b/rpm-po.patch index 665ca72..aa16412 100644 --- a/rpm-po.patch +++ b/rpm-po.patch @@ -1,205 +1,3 @@ -diff -urN rpm-4.3.org/po/es.po rpm-4.3/po/es.po ---- rpm-4.3.org/po/es.po 2003-12-28 01:21:01.909701072 +0100 -+++ rpm-4.3/po/es.po 2003-12-28 01:21:24.434276816 +0100 -@@ -2,17 +2,16 @@ - # Copyright (C) YEAR Free Software Foundation, Inc. - # FIRST AUTHOR , YEAR. - # --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2002-08-10 12:12-0400\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" --"Language-Team: LANGUAGE \n" -+"Last-Translator: UNKNOWN\n" -+"Language-Team: Spanish\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 - msgid "Failed build dependencies:\n" -diff -urN rpm-4.3.org/po/fr.po rpm-4.3/po/fr.po ---- rpm-4.3.org/po/fr.po 2003-12-28 01:21:01.906701528 +0100 -+++ rpm-4.3/po/fr.po 2003-12-28 01:14:10.000000000 +0100 -@@ -7,7 +7,6 @@ - # N'hésitez pas à m'envoyez un courriel si vous avez des - # suggestions/corrections. - # --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: RPM 4.2.1\n" -@@ -460,7 +460,7 @@ - #: build/files.c:502 - #, c-format - msgid "Missing %s in %s %s\n" --msgstr "%s manquant(e) dans %s\n" -+msgstr "%s manquant(e) dans %s %s\n" - - #: build/files.c:559 - #, c-format -@@ -845,7 +845,7 @@ - #: build/parseFiles.c:42 - #, c-format - msgid "line %d: Error parsing %%files: %s\n" --msgstr "ligne %d: erreur dans l'analyse syntaxique de %%files\n" -+msgstr "ligne %d: erreur dans l'analyse syntaxique de %%files: %s\n" - - #: build/parseFiles.c:86 - #, c-format -@@ -2801,7 +2801,7 @@ - #, c-format - msgid "package %s pre-transaction syscall(s): %s failed: %s" - msgstr "" --"échec du(des) appel(s) système(s) de la pré-transaction du paquetage %s: %s" -+"%s échec du(des) appel(s) système(s) de la pré-transaction du paquetage %s: %s" - - #: lib/rpmps.c:262 - #, c-format -@@ -3441,7 +3441,7 @@ - #: rpmdb/rpmdb.c:2910 - #, c-format - msgid "error(%d) allocating new package instance\n" --msgstr "erreur en allouant une nouvelle instance de paquetage\n" -+msgstr "erreur(%d) en allouant une nouvelle instance de paquetage\n" - - #: rpmdb/rpmdb.c:2964 - msgid "rpmdbAdd: skipping" -@@ -3607,7 +3607,7 @@ - #: rpmio/macro.c:1310 - #, c-format - msgid "A %% is followed by an unparseable macro\n" --msgstr "Un % est suivi d'une macro in-analysable\n" -+msgstr "Un %% est suivi d'une macro in-analysable\n" - - #: rpmio/macro.c:1439 - #, c-format -diff -urN rpm-4.3.org/po/id.po rpm-4.3/po/id.po ---- rpm-4.3.org/po/id.po 2003-12-28 01:21:01.914700312 +0100 -+++ rpm-4.3/po/id.po 2003-12-28 01:21:24.438276208 +0100 -@@ -2,17 +2,16 @@ - # Copyright (C) YEAR Free Software Foundation, Inc. - # FIRST AUTHOR , YEAR. - # --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2002-08-10 12:12-0400\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" --"Language-Team: LANGUAGE \n" -+"Last-Translator: UNKNOWN\n" -+"Language-Team: Indonesian\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 - msgid "Failed build dependencies:\n" -diff -urN rpm-4.3.org/po/it.po rpm-4.3/po/it.po ---- rpm-4.3.org/po/it.po 2003-12-28 01:21:01.903701984 +0100 -+++ rpm-4.3/po/it.po 2003-12-28 01:21:24.441275752 +0100 -@@ -2,17 +2,16 @@ - # Copyright (C) YEAR Free Software Foundation, Inc. - # FIRST AUTHOR , YEAR. - # --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2002-08-10 12:12-0400\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" --"Language-Team: LANGUAGE \n" -+"Last-Translator: UNKNOWN\n" -+"Language-Team: Italian\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 - msgid "Failed build dependencies:\n" -diff -urN rpm-4.3.org/po/ja.po rpm-4.3/po/ja.po ---- rpm-4.3.org/po/ja.po 2003-12-28 01:21:01.913700464 +0100 -+++ rpm-4.3/po/ja.po 2003-12-28 01:21:24.445275144 +0100 -@@ -2,7 +2,6 @@ - # Kanda Mitsru - # rpm message catalog - # Kanda Mitsru --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: rpm 4.0.3\n" -@@ -13,7 +12,7 @@ - "Language-Team: JRPM \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=EUC-JP\n" --"Content-Transfer-Encoding: EUC-JP\n" -+"Content-Transfer-Encoding: 8bit\n" - - #: build.c:40 - #, fuzzy -diff -urN rpm-4.3.org/po/pt_BR.po rpm-4.3/po/pt_BR.po ---- rpm-4.3.org/po/pt_BR.po 2003-12-28 01:21:01.905701680 +0100 -+++ rpm-4.3/po/pt_BR.po 2003-12-28 01:14:58.000000000 +0100 -@@ -6,6 +6,9 @@ - "Project-Id-Version: rpm 4.0.3\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2004-01-05 17:24+0000\n" -+"PO-Revision-Date: 2002-02-14 10:51+0000\n" -+"Last-Translator: José Nuno Coelho Sanarra Pires \n" -+"Language-Team: pt , YEAR. - # --#, fuzzy - msgid "" - msgstr "" - "Project-Id-Version: rpm 4.0.3\n" - "POT-Creation-Date: 2002-08-10 12:12-0400\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" --"Language-Team: LANGUAGE \n" -+"Last-Translator: UNKNOWN\n" -+"Language-Team: Ukrainian\n" - "MIME-Version: 1.0\n" --"Content-Type: text/plain; charset=CHARSET\n" --"Content-Transfer-Encoding: ENCODING\n" -+"Content-Type: text/plain; charset=KOI8-U\n" -+"Content-Transfer-Encoding: 8bit\n" - - #: build.c:40 - msgid "Failed build dependencies:\n" --- rpm-4.3/configure.ac.orig 2004-02-01 20:53:09.000000000 +0100 +++ rpm-4.3/configure.ac 2004-02-01 21:22:12.430982800 +0100 @@ -37,7 +37,7 @@ diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch index bee6b94..f0de81a 100644 --- a/rpm-python-fix.patch +++ b/rpm-python-fix.patch @@ -1,17 +1,18 @@ -diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am ---- rpm-4.3.org/python/Makefile.am 2003-12-27 23:56:46.082303664 +0100 -+++ rpm-4.3/python/Makefile.am 2003-12-28 00:07:26.082008920 +0100 -@@ -29,46 +29,33 @@ - rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h +--- rpm.org/python/Makefile.am 2004-06-14 12:02:25.891768016 +0200 ++++ rpm/python/Makefile.am 2004-06-14 12:08:23.614385912 +0200 +@@ -27,48 +27,35 @@ + rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h spec-py.h mylibs= \ - $(top_builddir)/lib/.libs/librpm.so \ - $(top_builddir)/rpmdb/.libs/librpmdb.so \ - $(top_builddir)/rpmio/.libs/librpmio.so \ - $(top_builddir)/popt/.libs/libpopt.so \ +- $(top_builddir)/build/.libs/librpmbuild.so \ + $(top_builddir)/lib/librpm.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ ++ $(top_builddir)/build/librpmbuild.la \ + -lbeecrypt \ + -lpopt \ @WITH_LIBELF_LIB@ @@ -38,17 +39,14 @@ diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am -_rpmdb_so_SOURCES = _rpmdb.c -_rpmdb_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,_rpmdb.so -+poptmodule_la_SOURCES = poptmodule.c -+poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version - +- -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 \ -+rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ - 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 +- 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 spec-py.c -librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES)) - -rpmmodule.so$(EXEEXT): librpmmodule.la @@ -59,6 +57,13 @@ diff -urN rpm-4.3.org/python/Makefile.am rpm-4.3/python/Makefile.am - -poptmodule.so$(EXEEXT): poptmodule.o - $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS) ++poptmodule_la_SOURCES = poptmodule.c ++poptmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version ++rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ ++ 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.c header-py.c \ # rpmal-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfi-py.c rpmmi-py.c \ + # rpmrc-py.c rpmte-py.c rpmts-py.c diff --git a/rpm-rpmrc.patch b/rpm-rpmrc.patch index 522285f..38b7c8d 100644 --- a/rpm-rpmrc.patch +++ b/rpm-rpmrc.patch @@ -1,69 +1,20 @@ -diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in ---- rpm-4.3.org/rpmrc.in 2003-12-28 00:17:35.518360512 +0100 -+++ rpm-4.3/rpmrc.in 2003-12-28 00:25:19.224866408 +0100 -@@ -11,56 +11,58 @@ - ############################################################# - # Values for RPM_OPT_FLAGS for various platforms +diff -urN rpm.org/rpmrc.in rpm/rpmrc.in +--- rpm.org/rpmrc.in 2004-06-14 11:26:46.823955752 +0200 ++++ rpm/rpmrc.in 2004-06-14 11:37:09.505293800 +0200 +@@ -66,6 +66,64 @@ + optflags: s390 -O2 -g + optflags: s390x -O2 -g --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: athlon -O2 -g -march=athlon --optflags: ia64 -O2 -g --optflags: x86_64 -O2 -g --optflags: amd64 -O2 -g -- --optflags: alpha -O2 -g -mieee --optflags: alphaev5 -O2 -g -mieee -mcpu=ev5 --optflags: alphaev56 -O2 -g -mieee -mcpu=ev56 --optflags: alphapca56 -O2 -g -mieee -mcpu=pca56 --optflags: alphaev6 -O2 -g -mieee -mcpu=ev6 --optflags: alphaev67 -O2 -g -mieee -mcpu=ev67 -- --optflags: sparc -O2 -g -m32 -mtune=ultrasparc --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: ppciseries -O2 -g -fsigned-char --optflags: ppcpseries -O2 -g -fsigned-char --optflags: ppc64 -O2 -g -fsigned-char -- --optflags: parisc -O2 -g -mpa-risc-1-0 --optflags: hppa1.0 -O2 -g -mpa-risc-1-0 --optflags: hppa1.1 -O2 -g -mpa-risc-1-0 --optflags: hppa1.2 -O2 -g -mpa-risc-1-0 --optflags: hppa2.0 -O2 -g -mpa-risc-1-0 -- --optflags: mips -O2 -g --optflags: mipsel -O2 -g -- --optflags: armv3l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv3 --optflags: armv4b -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 --optflags: armv4l -O2 -g -fsigned-char -fomit-frame-pointer -march=armv4 -- --optflags: atarist -O2 -g -fomit-frame-pointer --optflags: atariste -O2 -g -fomit-frame-pointer --optflags: ataritt -O2 -g -fomit-frame-pointer --optflags: falcon -O2 -g -fomit-frame-pointer --optflags: atariclone -O2 -g -fomit-frame-pointer --optflags: milan -O2 -g -fomit-frame-pointer --optflags: hades -O2 -g -fomit-frame-pointer -- --optflags: s390 -O2 -g --optflags: s390x -O2 -g +optflags: i386 -O2 -march=i386%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i386: %{specflags_i386}}} -+#optflags: i386 -O2 -march=i386 -mcpu=i686 ++#optflags: i386 -O2 -march=i486 -mcpu=pentium4 +optflags: i486 -O2 -march=i486%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i486: %{specflags_i486}}} +optflags: i586 -O2 -march=i586%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i586: %{specflags_i586}}} +optflags: i686 -O2 -march=i686%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_i686: %{specflags_i686}}} +optflags: athlon -O2 -march=athlon%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32: %{specflags_ia32}}%{?specflags_athlon: %{specflags_athlon}}} +optflags: ia64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia64: %{specflags_ia64}}} -+optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}} %{?specflags_amd64: %{specflags_amd64}}} -+optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}} %{?specflags_x86_64: %{specflags_x86_64}}} ++optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_x86_64: %{specflags_x86_64}}} ++optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}} ++optflags: ia32e -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ia32e: %{specflags_ia32e}}} + +optflags: alpha -O2 -mieee%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}} +optflags: alphaev5 -O2 -mieee -mcpu=ev5%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev5: %{specflags_alphaev5}}} @@ -73,6 +24,7 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in +optflags: alphaev67 -O2 -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}} + +optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}} ++optflags: sparcv8 -O2 -m32 -mcpu=ultrasparc -mv8%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv8: %{specflags_sparcv8}}} +optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparcv9: %{specflags_sparcv9}}} +optflags: sparc64 -O2 -m64 -mcpu=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}%{?specflags_sparc64: %{specflags_sparc64}}} + @@ -107,6 +59,11 @@ diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in +optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}} +optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}} + - ++ ++ ############################################################# ++ # Canonical arch names and numbers ++ ############################################################# # Canonical arch names and numbers + + diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch index cdab219..d432b08 100644 --- a/rpm-system_libs-more.patch +++ b/rpm-system_libs-more.patch @@ -5,8 +5,8 @@ diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am po/*.in po/*.po po/rpm.pot \ rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c --SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . -+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . +-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . ++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . INCLUDES = \ -I$(top_srcdir)/build \ diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch index 32812e9..0629b62 100644 --- a/rpm-system_libs.patch +++ b/rpm-system_libs.patch @@ -1,7 +1,7 @@ -diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac ---- rpm-4.3.org/configure.ac 2004-01-07 02:28:38.420706689 +0100 -+++ rpm-4.3/configure.ac 2004-01-07 02:29:17.078719715 +0100 -@@ -425,6 +425,18 @@ +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 +@@ -428,6 +428,18 @@ AC_SUBST(WITH_BEECRYPT_INCLUDE) AC_SUBST(WITH_BEECRYPT_LIB) @@ -20,7 +20,7 @@ diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac 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]) ]) -@@ -1193,7 +1205,7 @@ +@@ -1203,7 +1215,7 @@ dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE @@ -29,18 +29,18 @@ diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac AC_CONFIG_FILES([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/perl.req scripts/perl.prov -@@ -1216,7 +1228,7 @@ - python/rpmdb/Makefile +@@ -1227,7 +1239,7 @@ python/rpmdb/test/Makefile + lua/Makefile ]) -AC_CONFIG_COMMANDS([default],[[ echo timestamp > popt/stamp-h.in +AC_CONFIG_COMMANDS([default],[[ echo timestamp > stamp-h.in ]],[[]]) -diff -urN rpm-4.3.org/lib/Makefile.am rpm-4.3/lib/Makefile.am ---- rpm-4.3.org/lib/Makefile.am 2004-01-07 02:27:38.909001150 +0100 -+++ rpm-4.3/lib/Makefile.am 2004-01-07 02:29:44.348085397 +0100 +diff -urN rpm.org/lib/Makefile.am rpm/lib/Makefile.am +--- rpm.org/lib/Makefile.am 2004-06-14 11:46:08.925289496 +0200 ++++ rpm/lib/Makefile.am 2004-06-14 11:47:13.502472272 +0200 @@ -40,7 +40,7 @@ librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ $(top_builddir)/rpmdb/librpmdb.la \ @@ -50,15 +50,15 @@ diff -urN rpm-4.3.org/lib/Makefile.am rpm-4.3/lib/Makefile.am @WITH_SELINUX_LIB@ getdate.c: getdate.y -diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am ---- rpm-4.3.org/Makefile.am 2004-01-07 02:27:37.031389024 +0100 -+++ rpm-4.3/Makefile.am 2004-01-07 02:29:17.082718889 +0100 +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 @@ -14,7 +14,7 @@ po/*.in po/*.po po/rpm.pot \ rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c --SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . -+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . +-SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ popt @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . ++SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . INCLUDES = \ -I$(top_srcdir)/build \ @@ -98,9 +98,9 @@ diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am CVSTAG = r$(subst .,-,$(VERSION)) -diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am ---- rpm-4.3.org/rpmdb/Makefile.am 2004-01-07 02:28:11.926180317 +0100 -+++ rpm-4.3/rpmdb/Makefile.am 2004-01-07 02:29:17.087717856 +0100 +diff -urN rpm.org/rpmdb/Makefile.am rpm/rpmdb/Makefile.am +--- rpm.org/rpmdb/Makefile.am 2004-06-14 11:46:09.726167744 +0200 ++++ rpm/rpmdb/Makefile.am 2004-06-14 11:47:13.524468928 +0200 @@ -9,7 +9,6 @@ -I$(top_srcdir)/lib \ -I$(top_srcdir)/rpmio \ @@ -118,18 +118,18 @@ diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am @WITH_LIBELF_LIB@ librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) -diff -urN rpm-4.3.org/rpmio/Makefile.am rpm-4.3/rpmio/Makefile.am ---- rpm-4.3.org/rpmio/Makefile.am 2004-01-07 02:27:43.915966813 +0100 -+++ rpm-4.3/rpmio/Makefile.am 2004-01-07 02:29:17.090717237 +0100 +diff -urN rpm.org/rpmio/Makefile.am rpm/rpmio/Makefile.am +--- rpm.org/rpmio/Makefile.am 2004-06-14 11:46:09.817153912 +0200 ++++ rpm/rpmio/Makefile.am 2004-06-14 11:48:20.584274288 +0200 @@ -11,7 +11,6 @@ INCLUDES = -I. \ -I$(top_srcdir) \ @WITH_BEECRYPT_INCLUDE@ \ - -I$(top_srcdir)/popt \ + -I$(top_srcdir)/lua/include \ + -I$(top_srcdir)/lua/local \ @INCPATH@ - - pkgincdir = $(pkgincludedir) -@@ -65,34 +64,34 @@ +@@ -69,34 +68,34 @@ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) tdigest_SOURCES = tdigest.c @@ -172,9 +172,9 @@ diff -urN rpm-4.3.org/rpmio/Makefile.am rpm-4.3/rpmio/Makefile.am tsw_SOURCES = tsw.c tsw_LDFLAGS = librpmio.la -diff -urN rpm-4.3.org/tools/Makefile.am rpm-4.3/tools/Makefile.am ---- rpm-4.3.org/tools/Makefile.am 2004-01-07 02:27:44.830777831 +0100 -+++ rpm-4.3/tools/Makefile.am 2004-01-07 02:29:17.096715997 +0100 +diff -urN rpm.org/tools/Makefile.am rpm/tools/Makefile.am +--- rpm.org/tools/Makefile.am 2004-06-14 11:46:09.906140384 +0200 ++++ rpm/tools/Makefile.am 2004-06-14 11:47:13.532467712 +0200 @@ -9,7 +9,6 @@ -I$(top_srcdir)/rpmdb \ -I$(top_srcdir)/rpmio \ @@ -183,7 +183,7 @@ diff -urN rpm-4.3.org/tools/Makefile.am rpm-4.3/tools/Makefile.am @WITH_LIBELF_INCLUDE@ \ @WITH_LIBDWARF_INCLUDE@ \ -I$(top_srcdir)/file/src \ -@@ -38,7 +37,7 @@ +@@ -37,7 +36,7 @@ debugedit_SOURCES = debugedit.c hashtab.c debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ -- 2.44.0