From 012a88192e1c9ac5acb3bbf7fa2c27f88d931a96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 28 Dec 2003 01:40:21 +0000 Subject: [PATCH] - updated to 4.3 20031227 snapshot Changed files: rpm-amd64.patch -> 1.4 rpm-examplesaredoc.patch -> 1.2 rpm-po.patch -> 1.5 rpm-python-fix.patch -> 1.7 rpm-rpmrc.patch -> 1.18 rpm-system_libs-more.patch -> 1.3 rpm-system_libs.patch -> 1.9 --- rpm-amd64.patch | 88 ++++------- rpm-examplesaredoc.patch | 8 +- rpm-po.patch | 106 ++++++++++++-- rpm-python-fix.patch | 40 ++--- rpm-rpmrc.patch | 99 +++++++------ rpm-system_libs-more.patch | 69 +++++---- rpm-system_libs.patch | 293 +++++++++++++++++++++++-------------- 7 files changed, 415 insertions(+), 288 deletions(-) diff --git a/rpm-amd64.patch b/rpm-amd64.patch index 2ca3533..9dde8a8 100644 --- a/rpm-amd64.patch +++ b/rpm-amd64.patch @@ -1,10 +1,10 @@ diff -urN rpm-4.3.org/build/parseSpec.c rpm-4.3/build/parseSpec.c ---- rpm-4.3.org/build/parseSpec.c 2003-11-16 11:30:21.000000000 +0100 -+++ rpm-4.3/build/parseSpec.c 2003-11-16 13:53:07.000000000 +0100 -@@ -194,6 +194,16 @@ +--- rpm-4.3.org/build/parseSpec.c 2003-12-27 23:56:47.451095576 +0100 ++++ rpm-4.3/build/parseSpec.c 2003-12-28 00:32:48.447574176 +0100 +@@ -189,6 +189,15 @@ + return 0; } /*@=boundswrite@*/ - +static const char *getAlternateArch(const char *arch) +{ + const char *alternate_arch = NULL; @@ -14,11 +14,10 @@ diff -urN rpm-4.3.org/build/parseSpec.c rpm-4.3/build/parseSpec.c + alternate_arch = "x86_64"; + return alternate_arch; +} -+ + /*@-boundswrite@*/ int readLine(Spec spec, int strip) - { -@@ -282,13 +292,15 @@ +@@ -277,13 +286,15 @@ match = 0; } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) { const char *arch = rpmExpand("%{_target_cpu}", NULL); @@ -37,16 +36,16 @@ diff -urN rpm-4.3.org/build/parseSpec.c rpm-4.3/build/parseSpec.c } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) { const char *os = rpmExpand("%{_target_os}", NULL); diff -urN rpm-4.3.org/installplatform rpm-4.3/installplatform ---- rpm-4.3.org/installplatform 2003-01-10 17:18:55.000000000 +0100 -+++ rpm-4.3/installplatform 2003-11-16 13:59:30.000000000 +0100 -@@ -34,6 +34,7 @@ +--- rpm-4.3.org/installplatform 2003-12-27 23:56:26.892221000 +0100 ++++ rpm-4.3/installplatform 2003-12-28 00:37:53.285231808 +0100 +@@ -31,6 +31,7 @@ + + case "$arch" in + i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;; ++ x86_64*|amd64*) SUBSTS="s/${arch}/x86_64/ s/${arch}/amd64/" ;; alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;; sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; - powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;; -+ x86_64*|amd64*) SUBSTS="s/${arch}/x86_64/ s/${arch}/amd64/" ;; - s390*) SUBSTS='s_s390x_s390_ s_s390\([^x]\|$\)_s390x\1_' ;; - *) SUBSTS=y___ ;; - esac + powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6ip]\|$\)_ppc64\1_ s_ppc\([^6ip]\|$\)_ppciseries_ s_ppc\([^6ip]\|$\)_ppcpseries_ s_ppc\([^6ip]\|$\)_ppc64iseries_ s_ppc\([^6ip]\|$\)_ppc64pseries_' ;; @@ -66,7 +67,7 @@ ppc-linux) MULTILIBNO=1 ;; ppc64-linux) LIB=lib64; MULTILIBNO=2 ;; @@ -57,66 +56,33 @@ diff -urN rpm-4.3.org/installplatform rpm-4.3/installplatform if [ -n "$MULTILIBNO" ]; then diff -urN rpm-4.3.org/lib/rpmrc.c rpm-4.3/lib/rpmrc.c ---- rpm-4.3.org/lib/rpmrc.c 2003-11-16 11:30:21.000000000 +0100 -+++ rpm-4.3/lib/rpmrc.c 2003-11-16 13:50:56.000000000 +0100 +--- rpm-4.3.org/lib/rpmrc.c 2003-12-27 23:56:25.717399600 +0100 ++++ rpm-4.3/lib/rpmrc.c 2003-12-28 00:38:48.681810248 +0100 @@ -1278,6 +1278,13 @@ } # endif -+# if defined(__linux__) && defined(__amd64__) -+ { ++# if defined(__linux__) && defined(__amd64__) ++ { + /* Defaults to amd64 if compiler supports __amd64__ */ -+ strcpy(un.machine, "amd64"); -+ } -+# endif -+ ++ strcpy(un.machine, "amd64"); ++ } ++# endif ++ # if defined(__linux__) && defined(__powerpc__) { unsigned pvr = 0; diff -urN rpm-4.3.org/rpmrc.in rpm-4.3/rpmrc.in ---- rpm-4.3.org/rpmrc.in 2003-11-16 11:30:21.000000000 +0100 -+++ rpm-4.3/rpmrc.in 2003-11-16 13:56:25.000000000 +0100 -@@ -18,7 +18,8 @@ - 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}}} -+optflags: x86_64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}} -+optflags: amd64 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_amd64: %{specflags_amd64}}} - - 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}}} -@@ -71,6 +72,7 @@ - arch_canon: i486: i486 1 - arch_canon: i386: i386 1 - arch_canon: x86_64: x86_64 1 -+arch_canon: amd64: amd64 1 - - arch_canon: alpha: alpha 2 - arch_canon: alphaev5: alphaev5 2 -@@ -201,7 +203,8 @@ +--- rpm-4.3.org/rpmrc.in 2003-12-28 00:27:30.039979488 +0100 ++++ rpm-4.3/rpmrc.in 2003-12-28 00:40:25.817043448 +0100 +@@ -203,8 +203,8 @@ buildarchtranslate: ia64: ia64 -buildarchtranslate: x86_64: x86_64 -+buildarchtranslate: amd64: amd64 +-buildarchtranslate: amd64: x86_64 +buildarchtranslate: x86_64: amd64 ++buildarchtranslate: amd64: amd64 ############################################################# # Architecture compatibility -@@ -270,6 +273,7 @@ - - arch_compat: ia64: i686 noarch - -+arch_compat: amd64: x86_64 - arch_compat: x86_64: athlon noarch - - os_compat: IRIX64: IRIX -@@ -299,6 +303,7 @@ - os_compat: BSD_OS: bsdi - os_compat: bsdi4.0: bsdi - -+buildarch_compat: amd64: noarch - buildarch_compat: ia64: noarch - - buildarch_compat: athlon: i686 diff --git a/rpm-examplesaredoc.patch b/rpm-examplesaredoc.patch index caaa012..159cc7a 100644 --- a/rpm-examplesaredoc.patch +++ b/rpm-examplesaredoc.patch @@ -1,6 +1,7 @@ ---- rpm-4.3/build/files.c.orig Thu Jul 10 12:05:14 2003 -+++ rpm-4.3/build/files.c Thu Jul 10 12:07:25 2003 -@@ -1977,9 +1977,11 @@ +diff -urN rpm-4.3.org/build/files.c rpm-4.3/build/files.c +--- rpm-4.3.org/build/files.c 2003-12-27 23:56:47.496088736 +0100 ++++ rpm-4.3/build/files.c 2003-12-28 00:28:14.088283128 +0100 +@@ -1982,10 +1982,12 @@ fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/doc"); fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/man"); fl.docDirs[fl.docDirCount++] = xstrdup("/usr/share/info"); @@ -8,6 +9,7 @@ fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_docdir}", NULL); fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_mandir}", NULL); fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_infodir}", NULL); + fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_javadocdir}", NULL); + fl.docDirs[fl.docDirCount++] = rpmGetPath("%{_examplesdir}", NULL); fl.fileList = NULL; diff --git a/rpm-po.patch b/rpm-po.patch index db8f918..551ffc0 100644 --- a/rpm-po.patch +++ b/rpm-po.patch @@ -1,6 +1,6 @@ -diff -uNr rpm-4.3.orig/po/es.po rpm-4.3/po/es.po ---- rpm-4.3.orig/po/es.po Tue Sep 2 00:02:22 2003 -+++ rpm-4.3/po/es.po Tue Sep 2 00:08:51 2003 +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. @@ -23,9 +23,57 @@ diff -uNr rpm-4.3.orig/po/es.po rpm-4.3/po/es.po #: build.c:40 msgid "Failed build dependencies:\n" -diff -uNr rpm-4.3.orig/po/id.po rpm-4.3/po/id.po ---- rpm-4.3.orig/po/id.po Tue Sep 2 00:02:22 2003 -+++ rpm-4.3/po/id.po Tue Sep 2 00:06:34 2003 +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 +@@ -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. @@ -48,9 +96,9 @@ diff -uNr rpm-4.3.orig/po/id.po rpm-4.3/po/id.po #: build.c:40 msgid "Failed build dependencies:\n" -diff -uNr rpm-4.3.orig/po/it.po rpm-4.3/po/it.po ---- rpm-4.3.orig/po/it.po Tue Sep 2 00:02:22 2003 -+++ rpm-4.3/po/it.po Tue Sep 2 00:06:05 2003 +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. @@ -73,9 +121,9 @@ diff -uNr rpm-4.3.orig/po/it.po rpm-4.3/po/it.po #: build.c:40 msgid "Failed build dependencies:\n" -diff -uNr rpm-4.3.orig/po/ja.po rpm-4.3/po/ja.po ---- rpm-4.3.orig/po/ja.po Tue Sep 2 00:02:22 2003 -+++ rpm-4.3/po/ja.po Tue Sep 2 00:09:51 2003 +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 @@ -84,7 +132,7 @@ diff -uNr rpm-4.3.orig/po/ja.po rpm-4.3/po/ja.po msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -@@ -12,7 +11,7 @@ +@@ -13,7 +12,7 @@ "Language-Team: JRPM \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" @@ -93,9 +141,35 @@ diff -uNr rpm-4.3.orig/po/ja.po rpm-4.3/po/ja.po #: build.c:40 #, fuzzy -diff -uNr rpm-4.3.orig/po/uk.po rpm-4.3/po/uk.po ---- rpm-4.3.orig/po/uk.po Tue Sep 2 00:02:22 2003 -+++ rpm-4.3/po/uk.po Tue Sep 2 00:07:15 2003 +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: 2003-12-07 15:11-0500\n" ++"PO-Revision-Date: 2002-02-14 10:51+0000\n" ++"Last-Translator: José Nuno Coelho Sanarra Pires \n" ++"Language-Team: pt , YEAR. diff --git a/rpm-python-fix.patch b/rpm-python-fix.patch index 57fd039..bee6b94 100644 --- a/rpm-python-fix.patch +++ b/rpm-python-fix.patch @@ -1,6 +1,7 @@ ---- rpm-4.3/python/Makefile.am.wig 2003-06-11 02:09:53.000000000 +0200 -+++ rpm-4.3/python/Makefile.am 2003-06-11 02:13:28.000000000 +0200 -@@ -29,47 +29,35 @@ +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 mylibs= \ @@ -8,11 +9,11 @@ - $(top_builddir)/rpmdb/.libs/librpmdb.so \ - $(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 \ -+ -lbeecrypt \ -+ -lpopt \ ++ $(top_builddir)/lib/librpm.la \ ++ $(top_builddir)/rpmdb/librpmdb.la \ ++ $(top_builddir)/rpmio/librpmio.la \ ++ -lbeecrypt \ ++ -lpopt \ @WITH_LIBELF_LIB@ LDADD = @@ -26,11 +27,11 @@ +rpmdb_LTLIBRARIES = _rpmdb.la -noinst_PROGRAMS = poptmodule.so -+rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version -+rpmmodule_la_LIBADD = @WITH_BEECRYPT_LIB@ ++rpmmodule_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version ++rpmmodule_la_LIBADD = @WITH_BEECRYPT_LIB@ -rpmmodule_so_SOURCES = --rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so +-rpmmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,rpmmodule.so -rpmmodule_so_LDADD = @WITH_BEECRYPT_LIB@ +_rpmdb_la_SOURCES = _rpmdb.c +_rpmdb_la_LDFLAGS = $(mylibs) $(LIBS) -module -avoid-version @@ -46,19 +47,18 @@ -noinst_LTLIBRARIES = librpmmodule.la -librpmmodule_la_SOURCES = rpmmodule.c header-py.c \ +rpmmodule_la_SOURCES = rpmmodule.c header-py.c \ - rpmbc-py.c rpmmpw-py.c rpmrng-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.so$(EXEEXT): $(librpmmodule_la_OBJECTS) -- $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) +-librpmmodule_OBJECTS = $(subst .c,.o,$(librpmmodule_la_SOURCES)) - --_rpmdb.so$(EXEEXT): _rpmdb.lo -- $(CC) -o $@ _rpmdb.lo $(_rpmdb_so_LDFLAGS) +-rpmmodule.so$(EXEEXT): librpmmodule.la +- $(CC) -o $@ $(librpmmodule_OBJECTS) $(rpmmodule_so_LDFLAGS) - --poptmodule.so$(EXEEXT): poptmodule.lo -- $(CC) -o $@ poptmodule.lo $(poptmodule_so_LDFLAGS) +-_rpmdb.so$(EXEEXT): _rpmdb.o +- $(CC) -o $@ _rpmdb.o $(_rpmdb_so_LDFLAGS) - +-poptmodule.so$(EXEEXT): poptmodule.o +- $(CC) -o $@ poptmodule.o $(poptmodule_so_LDFLAGS) + # 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 41a11e2..4602eb3 100644 --- a/rpm-rpmrc.patch +++ b/rpm-rpmrc.patch @@ -1,6 +1,7 @@ ---- rpm-4.2/rpmrc.in.wiget Fri Jan 10 21:34:26 2003 -+++ rpm-4.2/rpmrc.in Thu Mar 27 18:56:27 2003 -@@ -11,55 +11,56 @@ +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 @@ -11,6 +12,7 @@ -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 @@ -50,58 +52,61 @@ -optflags: atariclone -O2 -g -fomit-frame-pointer -optflags: milan -O2 -g -fomit-frame-pointer -optflags: hades -O2 -g -fomit-frame-pointer -+optflags: i386 -O2 -march=i386 -+#optflags: i386 -O2 -march=i386 -mcpu=i686 -+optflags: i486 -O2 -march=i486 -+optflags: i586 -O2 -march=i586 -+optflags: i686 -O2 -march=i686 -+optflags: athlon -O2 -march=athlon -+optflags: ia64 -O2 -+optflags: x86_64 -O2 +- +-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: 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: alpha -O2 -mieee -+optflags: alphaev5 -O2 -mieee -mcpu=ev5 -+optflags: alphaev56 -O2 -mieee -mcpu=ev56 -+optflags: alphapca56 -O2 -mieee -mcpu=pca56 -+optflags: alphaev6 -O2 -mieee -mcpu=ev6 -+optflags: alphaev67 -O2 -mieee -mcpu=ev67 ++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}}} ++optflags: alphaev56 -O2 -mieee -mcpu=ev56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev56: %{specflags_alphaev56}}} ++optflags: alphapca56 -O2 -mieee -mcpu=pca56%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphapca56: %{specflags_alphapca56}}} ++optflags: alphaev6 -O2 -mieee -mcpu=ev6%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev6: %{specflags_alphaev6}}} ++optflags: alphaev67 -O2 -mieee -mcpu=ev67%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_alpha: %{specflags_alpha}}%{?specflags_alphaev67: %{specflags_alphaev67}}} + -+optflags: sparc -O2 -m32 -mtune=ultrasparc -+optflags: sparcv9 -O2 -m32 -mcpu=ultrasparc -+optflags: sparc64 -O2 -m64 -mcpu=ultrasparc ++optflags: sparc -O2 -m32 -mtune=ultrasparc%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_sparc: %{specflags_sparc}}} ++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}}} + -+optflags: m68k -O2 -fomit-frame-pointer ++optflags: m68k -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_m68k: %{specflags_m68k}}} + -+optflags: ppc -O2 -fsigned-char -+optflags: ppciseries -O2 -fsigned-char -+optflags: ppcpseries -O2 -fsigned-char -+optflags: ppc64 -O2 -fsigned-char ++optflags: ppc -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}} ++optflags: ppciseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppciseries: %{specflags_ppciseries}}} ++optflags: ppcpseries -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppcpseries: %{specflags_ppcpseries}}} ++optflags: ppc64 -O2 -fsigned-char%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ppc: %{specflags_ppc}}%{?specflags_ppc64: %{specflags_ppc64}}} + -+optflags: parisc -O2 -mpa-risc-1-0 -+optflags: hppa1.0 -O2 -mpa-risc-1-0 -+optflags: hppa1.1 -O2 -mpa-risc-1-0 -+optflags: hppa1.2 -O2 -mpa-risc-1-0 -+optflags: hppa2.0 -O2 -mpa-risc-1-0 ++optflags: parisc -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_parisc: %{specflags_parisc}}} ++optflags: hppa1.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_0: %{specflags_hppa1_0}}} ++optflags: hppa1.1 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_1: %{specflags_hppa1_1}}} ++optflags: hppa1.2 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa1_2: %{specflags_hppa1_2}}} ++optflags: hppa2.0 -O2 -mpa-risc-1-0%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hppa2_0: %{specflags_hppa2_0}}} + -+optflags: mips -O2 -+optflags: mipsel -O2 ++optflags: mips -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}} ++optflags: mipsel -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_mips: %{specflags_mips}}%{?specflags_mipsel: %{specflags_mipsel}}} + -+optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3 -+optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4 -+optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4 ++optflags: armv3l -O2 -fsigned-char -fomit-frame-pointer -march=armv3%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv3l: %{specflags_armv3l}}} ++optflags: armv4b -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4b: %{specflags_armv4b}}} ++optflags: armv4l -O2 -fsigned-char -fomit-frame-pointer -march=armv4%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_armv4l: %{specflags_armv4l}}} ++ ++optflags: atarist -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atarist: %{specflags_atarist}}} ++optflags: atariste -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariste: %{specflags_atariste}}} ++optflags: ataritt -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_ataritt: %{specflags_ataritt}}} ++optflags: falcon -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_falcon: %{specflags_falcon}}} ++optflags: atariclone -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_atariclone: %{specflags_atariclone}}} ++optflags: milan -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_milan: %{specflags_milan}}} ++optflags: hades -O2 -fomit-frame-pointer%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_hades: %{specflags_hades}}} ++ ++optflags: s390 -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}} ++optflags: s390x -O2%{!?nospecflags:%{?specflags: %{specflags}}%{?specflags_s390: %{specflags_s390}}%{?specflags_s390x: %{specflags_s390x}}} + -+optflags: atarist -O2 -fomit-frame-pointer -+optflags: atariste -O2 -fomit-frame-pointer -+optflags: ataritt -O2 -fomit-frame-pointer -+optflags: falcon -O2 -fomit-frame-pointer -+optflags: atariclone -O2 -fomit-frame-pointer -+optflags: milan -O2 -fomit-frame-pointer -+optflags: hades -O2 -fomit-frame-pointer - --optflags: s390 -O2 -g --optflags: s390x -O2 -g -+optflags: s390 -O2 -+optflags: s390x -O2 ############################################################# # Canonical arch names and numbers diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch index 0b96381..cdab219 100644 --- a/rpm-system_libs-more.patch +++ b/rpm-system_libs-more.patch @@ -1,39 +1,46 @@ ---- rpm-4.2/rpmdb/Makefile.am.wiget Fri Mar 28 00:48:52 2003 -+++ rpm-4.2/rpmdb/Makefile.am Fri Mar 28 01:06:18 2003 -@@ -26,11 +26,16 @@ +diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am +--- rpm-4.3.org/Makefile.am 2003-12-28 01:33:43.917858224 +0100 ++++ rpm-4.3/Makefile.am 2003-12-28 02:01:02.060822640 +0100 +@@ -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@ @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 . + + INCLUDES = \ + -I$(top_srcdir)/build \ +diff -urN rpm-4.3.org/rpmdb/Makefile.am rpm-4.3/rpmdb/Makefile.am +--- rpm-4.3.org/rpmdb/Makefile.am 2003-12-28 01:33:46.160517288 +0100 ++++ rpm-4.3/rpmdb/Makefile.am 2003-12-28 01:56:22.000000000 +0100 +@@ -25,18 +25,15 @@ noinst_HEADERS = fprint.h header_internal.h legacy.h pkgbindir = @RPMCONFIGDIR@ -+if WITHOUT_INTERNAL_DB +-pkgbin_PROGRAMS = \ +- rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify +-noinst_PROGRAMS = \ +- rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \ +- rpmdb_upgrade +pkgbin_PROGRAMS = +noinst_PROGRAMS = -+else - pkgbin_PROGRAMS = \ - rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify - noinst_PROGRAMS = \ - rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \ - rpmdb_upgrade -+endif mylibs = librpmdb.la ---- rpm-4.2/configure.ac.wiget Fri Mar 28 01:06:49 2003 -+++ rpm-4.2/configure.ac Fri Mar 28 01:11:34 2003 -@@ -500,6 +497,7 @@ - [libdb3="$libdb3 $libthread"; AC_MSG_RESULT(yes)]) - LIBS="$saveLIBS" - fi -+without_internal_db=yes - - else - dnl ------------------ with internal db -@@ -510,7 +508,9 @@ - libdb3="# \$(top_builddir)/db3/libdb.la" - libdb3a="\$(top_builddir)/db3/libdb.a" - dnl INCPATH="-I\$(top_builddir)/$(WITH_DB_SUBDIR) $INCPATH" -+ without_internal_db=no - fi -+AM_CONDITIONAL(WITHOUT_INTERNAL_DB, test x$without_internal_db = xyes) - - AC_SUBST(WITH_DB_SUBDIR) - AC_SUBST(WITH_INTERNAL_DB) + LIBS = + + # XXX watchout, ../db3/libdb.la created by this Makefile may surprise +-libdb_la = $(top_builddir)/$(WITH_DB_SUBDIR)/libdb.la ++libdb_la = + + # XXX grrr, RPM_BUILD_ROOT prevents build pollution if/when -lrpm different + LDFLAGS = -L$(RPM_BUILD_ROOT)$(usrlibdir) -L$(DESTDIR)$(usrlibdir) +@@ -52,7 +49,7 @@ + $(top_builddir)/rpmio/librpmio.la \ + @WITH_POPT_LIB@ \ + @WITH_LIBELF_LIB@ +-librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) ++librpmdb_la_LIBADD = $(DBLIBOBJS) $(libdb_la) -ldb + librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) $(libdb_la) + + # XXX make sure that db.h symlink is generated diff --git a/rpm-system_libs.patch b/rpm-system_libs.patch index e858e1f..1f74714 100644 --- a/rpm-system_libs.patch +++ b/rpm-system_libs.patch @@ -1,6 +1,174 @@ ---- rpm-4.3/rpmio/Makefile.am.wiget 2003-06-11 02:05:34.000000000 +0200 -+++ rpm-4.3/rpmio/Makefile.am 2003-06-11 02:05:34.000000000 +0200 -@@ -65,34 +65,34 @@ +diff -urN rpm-4.3.org/configure.ac rpm-4.3/configure.ac +--- rpm-4.3.org/configure.ac 2003-12-28 02:08:42.969753832 +0100 ++++ rpm-4.3/configure.ac 2003-12-28 02:09:04.576469112 +0100 +@@ -431,6 +431,18 @@ + AC_SUBST(WITH_BEECRYPT_INCLUDE) + AC_SUBST(WITH_BEECRYPT_LIB) + ++WITH_POPT_SUBDIR= ++WITH_POPT_LIB= ++AC_CHECK_HEADERS([popt.h]) ++AC_CHECK_LIB(popt, poptGetContext, [ ++ AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.]) ++ WITH_POPT_LIB="-lpopt" ++ ],[WITH_POPT_SUBDIR="popt" ++ WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"]) ++ ++AC_SUBST(WITH_POPT_SUBDIR) ++AC_SUBST(WITH_POPT_LIB) ++ + 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]) + ]) +@@ -1218,7 +1230,7 @@ + dnl # XXX Propagate -lucb to popt ... + dnl export LIBS INCPATH CONFIG_SITE + +-AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) ++AC_CONFIG_SUBDIRS(file) + + AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec + scripts/perl.req scripts/perl.prov +@@ -1240,7 +1252,7 @@ + python/Makefile + python/rpmdb/Makefile + python/rpmdb/test/Makefile +- ], [ echo timestamp > popt/stamp-h.in ++ ], [ + echo timestamp > stamp-h.in + ] + ) +diff -urN rpm-4.3.org/configure.ac.orig rpm-4.3/configure.ac.orig +--- rpm-4.3.org/configure.ac.orig 2003-12-28 02:08:50.057676304 +0100 ++++ rpm-4.3/configure.ac.orig 2003-12-28 02:08:04.494602944 +0100 +@@ -1222,6 +1222,7 @@ + + AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec + scripts/perl.req scripts/perl.prov ++ scripts/php.req scripts/php.prov + rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile + scripts/Makefile scripts/brp-redhat + scripts/macros.perl scripts/macros.php scripts/macros.python +diff -urN rpm-4.3.org/lib/Makefile.am rpm-4.3/lib/Makefile.am +--- rpm-4.3.org/lib/Makefile.am 2003-12-28 02:08:42.972753376 +0100 ++++ rpm-4.3/lib/Makefile.am 2003-12-28 02:10:03.310540176 +0100 +@@ -10,7 +10,6 @@ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ +- -I$(top_srcdir)/popt \ + @INCPATH@ + + EXTRA_DIST = getdate.y +@@ -40,7 +39,7 @@ + librpm_la_LDFLAGS = -release 4.3 $(LDFLAGS) \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la \ ++ @WITH_POPT_LIB@ \ + -lselinux + + getdate.c: getdate.y +@@ -93,7 +92,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) +@@ -104,8 +103,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-4.3.org/Makefile.am rpm-4.3/Makefile.am +--- rpm-4.3.org/Makefile.am 2003-12-28 02:08:42.937758696 +0100 ++++ rpm-4.3/Makefile.am 2003-12-28 02:09:04.580468504 +0100 +@@ -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 . + + INCLUDES = \ + -I$(top_srcdir)/build \ +@@ -22,7 +22,6 @@ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ +- -I$(top_srcdir)/popt \ + @WITH_LIBELF_INCLUDE@ \ + @INCPATH@ + +@@ -34,7 +33,7 @@ + $(top_builddir)/lib/librpm.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la \ ++ -lpopt \ + @WITH_ZLIB_LIB@ \ + @INTLLIBS@ \ + @LIBMISC@ +@@ -107,7 +106,6 @@ + -load lib/rpmlib.lcd \ + -load rpmdb/rpmdb.lcd \ + -load rpmio/rpmio.lcd \ +- -load popt/popt.lcd \ + $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) + + .PHONY: lint +@@ -117,9 +115,7 @@ + `make -s sources -C lib` \ + `make -s sources -C rpmdb` \ + `make -s sources -C rpmio` \ +- `make -s sources -C beecrypt` \ +- `make -s sources -C file/src` \ +- `make -s sources -C popt` ++ `make -s sources -C file/src` + + 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 2003-12-28 02:08:53.054220760 +0100 ++++ rpm-4.3/rpmdb/Makefile.am 2003-12-28 02:09:04.581468352 +0100 +@@ -9,7 +9,6 @@ + -I$(top_srcdir)/lib \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ +- -I$(top_srcdir)/popt \ + @WITH_LIBELF_INCLUDE@ \ + @INCPATH@ + +@@ -51,7 +50,7 @@ + tagname.c tagtbl.c + librpmdb_la_LDFLAGS = -release 4.3 \ + $(top_builddir)/rpmio/librpmio.la \ +- $(top_builddir)/popt/libpopt.la \ ++ @WITH_POPT_LIB@ \ + @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 2003-12-28 02:08:42.988750944 +0100 ++++ rpm-4.3/rpmio/Makefile.am 2003-12-28 02:09:04.582468200 +0100 +@@ -11,7 +11,6 @@ + INCLUDES = -I. \ + -I$(top_srcdir) \ + @WITH_BEECRYPT_INCLUDE@ \ +- -I$(top_srcdir)/popt \ + @INCPATH@ + + pkgincdir = $(pkgincludedir) +@@ -65,34 +64,34 @@ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) tdigest_SOURCES = tdigest.c @@ -43,31 +211,18 @@ tsw_SOURCES = tsw.c tsw_LDFLAGS = librpmio.la ---- rpm-4.3/rpmdb/Makefile.am.wiget 2003-05-23 17:00:19.000000000 +0200 -+++ rpm-4.3/rpmdb/Makefile.am 2003-06-11 02:05:34.000000000 +0200 -@@ -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 2003-05-23 16:59:36.000000000 +0200 -+++ rpm-4.3/lib/Makefile.am 2003-06-11 02:05:34.000000000 +0200 -@@ -40,7 +40,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@ - - getdate.c: getdate.y - @echo expect 10 shift/reduce conflicts ---- rpm-4.3/tools/Makefile.am.wiget 2003-05-23 17:00:27.000000000 +0200 -+++ rpm-4.3/tools/Makefile.am 2003-06-11 02:05:34.000000000 +0200 -@@ -40,7 +40,7 @@ +diff -urN rpm-4.3.org/tools/Makefile.am rpm-4.3/tools/Makefile.am +--- rpm-4.3.org/tools/Makefile.am 2003-12-28 02:08:42.852771616 +0100 ++++ rpm-4.3/tools/Makefile.am 2003-12-28 02:09:26.913073432 +0100 +@@ -9,7 +9,6 @@ + -I$(top_srcdir)/rpmdb \ + -I$(top_srcdir)/rpmio \ + @WITH_BEECRYPT_INCLUDE@ \ +- -I$(top_srcdir)/popt \ + @WITH_LIBELF_INCLUDE@ \ + @WITH_LIBDWARF_INCLUDE@ \ + -I$(top_srcdir)/file/src \ +@@ -38,7 +37,7 @@ debugedit_SOURCES = debugedit.c hashtab.c debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \ @@ -76,85 +231,3 @@ javadeps_SOURCES = javadeps.c ---- rpm-4.3/configure.ac.wiget 2003-06-11 02:05:34.000000000 +0200 -+++ rpm-4.3/configure.ac 2003-06-11 02:05:34.000000000 +0200 -@@ -431,6 +431,17 @@ - AC_SUBST(WITH_BEECRYPT_INCLUDE) - AC_SUBST(WITH_BEECRYPT_LIB) - -+WITH_POPT_SUBDIR= -+WITH_POPT_LIB= -+AC_CHECK_HEADERS([popt.h]) -+AC_CHECK_LIB(popt, poptGetContext, [ -+ AC_DEFINE(HAVE_LIBPOPT, 1, [Define to 1 if you have libpopt.]) -+ WITH_POPT_LIB="-lpopt" -+ ],[WITH_POPT_SUBDIR="popt" -+ WITH_POPT_LIB="\$(top_builddir)/popt/libpopt.la"]) -+ -+AC_SUBST(WITH_POPT_SUBDIR) -+AC_SUBST(WITH_POPT_LIB) - 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]) - ]) -@@ -491,6 +502,7 @@ - - dnl Check for Berkeley db3 API. - AC_CHECK_FUNC(db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"], -+ AC_CHECK_LIB(db-4.1, db_create, [DBLIBSRCS="$DBLIBSRCS db3.c"; libdb3="-ldb-4.1"], - 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"], -@@ -499,6 +511,7 @@ - ) - ) - ) -+ ) - ) - - if test X"$DBLIBSRCS" = X; then -@@ -1257,7 +1270,7 @@ - dnl # XXX Propagate -lucb to popt ... - dnl export LIBS INCPATH CONFIG_SITE - --AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3) -+AC_CONFIG_SUBDIRS(beecrypt file) - - AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec - scripts/perl.req scripts/perl.prov -@@ -1281,7 +1294,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.3/Makefile.am.wiget 2003-05-23 16:57:23.000000000 +0200 -+++ rpm-4.3/Makefile.am 2003-06-11 02:08:38.000000000 +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_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . - - INCLUDES = \ - -I$(top_srcdir)/build \ -@@ -34,7 +34,7 @@ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la \ -+ -lpopt \ - @WITH_ZLIB_LIB@ \ - @INTLLIBS@ \ - @LIBMISC@ -@@ -105,7 +105,6 @@ - -load lib/rpmlib.lcd \ - -load rpmdb/rpmdb.lcd \ - -load rpmio/rpmio.lcd \ -- -load popt/popt.lcd \ - $(DEFS) $(INCLUDES) rpmqv.c $(rpmb_SOURCES) - - .PHONY: lint -- 2.44.0