---- rpm-4.0.2/configure.in.orig Sat Mar 16 20:30:55 2002
-+++ rpm-4.0.2/configure.in Sat Mar 16 20:32:13 2002
+--- rpm-4.0.4/configure.in.orig Sat Mar 16 20:30:55 2002
++++ rpm-4.0.4/configure.in Sat Mar 16 20:32:13 2002
@@ -17,8 +17,6 @@
dnl Set of available languages.
ALL_LINGUAS="cs da de en_RN es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
AC_FUNC_FNMATCH
if test $ac_cv_func_fnmatch_works = no; then
- LIBOBJS="$LIBOBJS fnmatch.o"
-- AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
+ AC_LIBOBJ([fnmatch])
-+dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
+ dnl XXX no expansion needed
+ dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
fi
-
@@ -771,7 +769,7 @@
dnl
dnl if test $rpm_cv_regex = yes; then
INCPATH="-I\$(top_builddir)/misc $INCPATH"
fi
AC_SUBST(INCPATH)
---- rpm-4.0.2/acconfig.h.orig Wed Mar 27 20:25:58 2002
-+++ rpm-4.0.2/acconfig.h Wed Mar 27 20:33:00 2002
-@@ -12,7 +12,7 @@
- a given entry is in the file.
-
- Leave the following blank line there!! Autoheader needs it. */
--^L
-+\f
-
- /* Define to the name of the distribution. */
- #undef PACKAGE
-@@ -162,7 +162,7 @@
- /* Build with dmalloc support? */
- #undef DMALLOC
-
--^L
-+\f
- /* Leave that blank line there!! Autoheader needs it.
- If you're adding to this file, keep in mind:
- The entries are in sort -df order: alphabetical, case insensitive,
---- rpm-4.0.2/lib/Makefile.am.wiget Wed Feb 14 20:44:20 2001
-+++ rpm-4.0.2/lib/Makefile.am Wed Feb 21 11:57:02 2001
-@@ -22,7 +22,7 @@
-
- lib_LTLIBRARIES = librpm.la
- librpm_la_SOURCES = \
-- cpio.c $(DBLIBSRCS) dbconfig.c depends.c \
-+ cpio.c dbconfig.c depends.c \
- formats.c fprint.c fs.c hash.c header.c install.c \
- md5.c md5sum.c misc.c package.c problems.c \
- poptBT.c poptQV.c query.c rpmchecksig.c rpmdb.c rpminstall.c \
+--- rpm-4.0.4/rpmio/Makefile.am.wiget2 Wed Jan 23 02:03:42 2002
++++ rpm-4.0.4/rpmio/Makefile.am Wed Feb 13 00:05:09 2002
+@@ -21,7 +21,7 @@
+ ugid.h
+ noinst_HEADERS = rpmio_internal.h rpmpgp.h
+
+-LIBS += @WITH_ZLIB_LIB@ -lrt -lpthread
++LIBS = @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
+
+ BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
+
+@@ -51,18 +51,18 @@
+ rm -f $(BEECRYPTLOBJS) *.o .created
+
+ tdigest_SOURCES = tdigest.c
+-tdigest_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
++tdigest_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
+
+ trpmio_SOURCES = trpmio.c
+-trpmio_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
++trpmio_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tkey_SOURCES = tkey.c
+ tkey_LDFLAGS = -all-static
+-tkey_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
++tkey_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
+
+ tring_SOURCES = tring.c
+ tring_LDFLAGS = -all-static
+-tring_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
++tring_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
+
+ dumpasn1_SOURCES = dumpasn1.c
+
+--- rpm-4.0.4/rpmdb/Makefile.am.wiget2 Wed Feb 13 00:11:45 2002
++++ rpm-4.0.4/rpmdb/Makefile.am Wed Feb 13 00:11:23 2002
+@@ -28,7 +28,7 @@
+ DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs)
+
+ lib_LTLIBRARIES = librpmdb.la
+-librpmdb_la_SOURCES = $(DBLIBSRCS) \
++librpmdb_la_SOURCES = \
+ dbconfig.c fprint.c poptDB.c rpmhash.c rpmdb.c
+ librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
+ librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)
---- rpm-4.0.2/build/files.c Sun May 26 13:40:43 2002
-+++ rpm-4.0.2-filon/build/files.c Sun May 26 13:39:44 2002
-@@ -1987,7 +1987,7 @@
- */
- static int generateDepends(Spec spec, Package pkg,
- struct cpioFileMapping *cpioList, int cpioCount,
-- int multiLib)
-+ int multiLib, StringBuf fileList, int *fileListLen)
- {
- StringBuf writeBuf;
- int writeBytes;
-@@ -2013,7 +2013,9 @@
- }
+diff -urN rpm-4.0.4.org/build/files.c rpm-4.0.4/build/files.c
+--- rpm-4.0.4.org/build/files.c Sun Jul 28 00:22:46 2002
++++ rpm-4.0.4/build/files.c Sun Jul 28 00:23:54 2002
+@@ -90,6 +90,10 @@
+ /*@unchecked@*/
+ static int multiLib = 0; /* MULTILIB */
- writeBytes += strlen(cpioList->fsPath) + 1;
-+ *fileListLen += strlen(cpioList->fsPath) + 1;
- appendLineStringBuf(writeBuf, cpioList->fsPath);
-+ appendLineStringBuf(fileList, cpioList->fsPath);
- }
++/* list of files */
++static StringBuf check_fileList = NULL;
++static int check_fileListLen = 0;
++
+ /**
+ * Package file tree walk data.
+ */
+@@ -1593,6 +1597,13 @@
+ (unsigned)fileMode, fileUname, fileGname, fileURL);
+ #endif
- for (dm = depMsgs; dm->msg != NULL; dm++) {
-@@ -2190,10 +2192,54 @@
- FREE(versions);
++ /* S_XXX macro must be consistent with type in find call at check-files script */
++ if (S_ISREG(fileMode)) {
++ appendStringBuf(check_fileList, diskURL);
++ appendStringBuf(check_fileList, "\n");
++ check_fileListLen += strlen(diskURL) + 1;
++ }
++
+ /* Add to the file list */
+ if (fl->fileListRecsUsed == fl->fileListRecsAlloced) {
+ fl->fileListRecsAlloced += 128;
+@@ -2655,11 +2671,54 @@
+ versions = hfd(versions, dvt);
}
-+int checkFiles(StringBuf fileList, int fileListLen)
++static int checkFiles(StringBuf fileList, int fileListLen)
+{
+ StringBuf readBuf = NULL;
+ char* myargv[3] = {NULL, NULL, NULL};
+exit:
+
+ freeStringBuf(readBuf);
-+ FREE(myargv[0]);
-+ FREE(myargv[1]);
++ _free(myargv[0]);
++ _free(myargv[1]);
+
+ return rc;
+}
{
Package pkg;
int res = 0;
-+ StringBuf fileList;
-+ int fileListLen = 0;
-+
-+ fileList = newStringBuf();
++ check_fileList = newStringBuf();
++ check_fileListLen = 0;
++
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
const char *n, *v, *r;
-@@ -2213,13 +2260,23 @@
- * XXX existence (rather than value) that will need to change as well.
- */
- if (headerGetEntry(pkg->header, RPMTAG_MULTILIBS, NULL, NULL, NULL)) {
-- generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 1);
-- generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 2);
-+ generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 1, fileList, &fileListLen);
-+ generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 2, fileList, &fileListLen);
- } else
-- generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 0);
-+ generateDepends(spec, pkg, pkg->cpioList, pkg->cpioCount, 0, fileList, &fileListLen);
- printDeps(pkg->header);
-
+ int rc;
+@@ -2687,5 +2746,15 @@
+ /*@=noeffect@*/
}
+ /* Now we have in fileList list of files from all packages.
+ */
+
+ if (res == 0)
-+ checkFiles(fileList, fileListLen);
++ checkFiles(check_fileList, check_fileListLen);
+
-+ freeStringBuf(fileList);
++ freeStringBuf(check_fileList);
+
return res;
}
---- rpm-4.0.2/platform.in Sun May 26 13:40:43 2002
-+++ rpm-4.0.2-filon/platform.in Sun May 26 12:11:26 2002
-@@ -38,6 +38,10 @@
- # Expanded at end of %install
+diff -Nur rpm-4.0.4.orig/platform.in rpm-4.0.4/platform.in
+--- rpm-4.0.4.orig/platform.in Sun Jun 30 00:07:54 2002
++++ rpm-4.0.4/platform.in Sun Jun 30 00:13:45 2002
+@@ -89,6 +89,10 @@
+ # Expanded at end of %install scriptlet.
#
+# Gets file list on input and buildroot as first parameter
---- rpm-4.0.2/build/files.c.orig Thu Jul 25 15:57:52 2002
-+++ rpm-4.0.2/build/files.c Thu Jul 25 16:40:55 2002
-@@ -1548,7 +1548,9 @@
+diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
+--- rpm-4.0.4/build/files.c Tue Jul 23 10:38:11 2002
++++ rpm-4.0.4-/build/files.c Tue Jul 23 10:37:57 2002
+@@ -1943,7 +1943,10 @@
/* Now process special doc, if there is one */
if (specialDoc) {
if (installSpecialDoc) {
-- doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
-+ int rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
+- (void) doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
++ int rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc",
++ pkg->specialDoc, test);
+ if (rc)
+ fl.processingFailed = rc;
}
/* Reset for %doc */
+Only in rpm-4.0.4-/build: tags
#set -x
COMPRESS_CMD="gzip -9nf"
-EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css js dia"
+EXCLUDE_SUFFIXES="htm html jpg jpeg png gif pdf css dia js"
EXCLUDE_MASKS=
RECOMPRESS_BZIP2=yes
-diff -ur rpm-4.0.2/build/files.c rpm-4.0.2-/build/files.c
---- rpm-4.0.2/build/files.c Fri May 17 14:28:01 2002
-+++ rpm-4.0.2-/build/files.c Fri May 17 14:26:29 2002
-@@ -813,6 +813,16 @@
+diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
+--- rpm-4.0.4/build/files.c Thu Feb 14 18:28:48 2002
++++ rpm-4.0.4-/build/files.c Fri May 17 11:16:53 2002
+@@ -1002,6 +1002,16 @@
appendStringBuf(pkg->specialDoc, "cp -pr ");
appendStringBuf(pkg->specialDoc, specialDocBuf);
appendLineStringBuf(pkg->specialDoc, " $DOCDIR");
}
}
-diff -ur rpm-4.0.2/platform.in rpm-4.0.2-/platform.in
---- rpm-4.0.2/platform.in Wed Jan 17 17:14:16 2001
-+++ rpm-4.0.2-/platform.in Fri May 17 14:27:34 2002
-@@ -51,6 +51,10 @@
- %{__os_install_post}\
+diff -ur rpm-4.0.4/platform.in rpm-4.0.4-/platform.in
+--- rpm-4.0.4/platform.in Fri May 17 11:18:12 2002
++++ rpm-4.0.4-/platform.in Fri May 17 11:17:44 2002
+@@ -102,6 +102,9 @@
+ %{__os_install_post}\
%{nil}
+# Executed at after copying %doc to DOCDIR, with $DOCDIR set
+%__compress_doc @prefix@/lib/rpm/compress-doc
+
-+
- #------------------------------------------------------------------------
- # Expanded at end of %prep
- #
+ @redhat@#---------------------------------------------------------------------
+ @redhat@# Expanded at end of %prep
+ @redhat@#
---- rpm-4.0.4/rpmpopt.in.wiget Fri Feb 15 09:45:59 2002
-+++ rpm-4.0.4/rpmpopt.in Fri Feb 15 09:48:54 2002
-@@ -171,26 +171,26 @@
- rpm exec --target rpmb --target
- rpm exec --short-circuit rpmb --short-circuit
+--- rpm-4.1/rpmpopt.in.wiget Thu Sep 19 00:32:02 2002
++++ rpm-4.1/rpmpopt.in Thu Sep 19 00:44:31 2002
+@@ -93,31 +93,31 @@
+ --POPTdesc=$"find package name that contains a required capability (needs rpmdb-redhat package installed)"
+
+ # colon separated i18n domains to use as PO catalogue lookaside for
+-* retrieving header group/description/summary.
++# retrieving header group/description/summary.
+ #
+ # For Red Hat, value should be "redhat-dist:redhat-powertools".
+ rpm alias --i18ndomains --define '_i18ndomains !#:+'
+
+ # Build policies enabled from command line. Last policy applies.
+-rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
+- --POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
+- --POPTargs=$"<policy>"
++#rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
++# --POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
++# --POPTargs=$"<policy>"
+
+ # Make RPM build tree
+-rpm exec --install-build-tree install-build-tree \
++rpmbuild exec --install-build-tree install-build-tree \
+ --POPTdesc=$"make all needed dirs for building binary rpms"
+
+ # Compiling with debuginfo may be enabled by --debug
+-rpm alias --debug --define 'debug 1' \
+- --POPTdesc=$"build packages with debug informations"
++#rpm alias --debug --define 'debug 1' \
++# --POPTdesc=$"build packages with debug informations"
+ rpmb alias --debug --define 'debug 1' \
+ --POPTdesc=$"build packages with debug informations"
+ rpmbuild alias --debug --define 'debug 1' \
+ --POPTdesc=$"build packages with debug informations"
+
+ # Conditional building
+-rpm exec --bcond find-spec-bcond \
+- --POPTdesc=$"find all --with/--without values"
++#rpm exec --bcond find-spec-bcond \
++# --POPTdesc=$"find all --with/--without values"
+ # Choose db interface:
+ # 0 same as 1
+ # 1 native db1 interface (e.g. linux glibc libdb1 routines).
+@@ -173,44 +173,49 @@
+ #rpm exec --target rpmb --target
+ #rpm exec --short-circuit rpmb --short-circuit
-rpm exec --initdb rpmd --initdb
-rpm exec --rebuilddb rpmd --rebuilddb
-rpm exec --verifydb rpmd --verifydb
-+#rpm exec --initdb rpmd --initdb
-+#rpm exec --rebuilddb rpmd --rebuilddb
-+#rpm exec --verifydb rpmd --verifydb
-
- #rpm exec -e rpme -e
- #rpm exec --erase rpme --erase
- #rpm exec -U rpmu -U
- #rpm exec --upgrade rpmu --upgrade
-
+-
-rpm exec --addsign rpmk --addsign
-rpm exec -K rpmk -K
-rpm exec --checksig rpmk --checksig
+-rpm exec --import rpmk --import
-rpm exec --resign rpmk --resign
-
-rpm exec -q rpmq -q
-rpm exec -V rpmv -V
-rpm exec -y rpmv -y
-rpm exec --verify rpmv --verify
+-
+-rpm alias --with --define "_with_!#:+ --with-!#:+" \
+- --POPTdesc=$"enable configure <option> for build" \
+- --POPTargs=$"<option>"
+-rpm alias --without --define "_without_!#:+ --without-!#:+" \
+- --POPTdesc=$"disable configure <option> for build" \
+- --POPTargs=$"<option>"
++#rpm exec --initdb rpmd --initdb
++#rpm exec --rebuilddb rpmd --rebuilddb
++#rpm exec --verifydb rpmd --verifydb
++
+#rpm exec --addsign rpmk --addsign
+#rpm exec -K rpmk -K
+#rpm exec --checksig rpmk --checksig
++#rpm exec --import rpmk --import
+#rpm exec --resign rpmk --resign
+
+#rpm exec -q rpmq -q
+#rpm exec -V rpmv -V
+#rpm exec -y rpmv -y
+#rpm exec --verify rpmv --verify
-
- rpm alias --with --define "_with_!#:+ --with-!#:+" \
- --POPTdesc=$"enable configure <option> for build" \
-@@ -213,6 +213,11 @@
- rpmb alias --without --define "_without_!#:+ --without-!#:+" \
- --POPTdesc=$"disable configure <option> for build" \
- --POPTargs=$"<option>"
++
++#rpm alias --with --define "_with_!#:+ --with-!#:+" \
++# --POPTdesc=$"enable configure <option> for build" \
++# --POPTargs=$"<option>"
++#rpm alias --without --define "_without_!#:+ --without-!#:+" \
++# --POPTdesc=$"disable configure <option> for build" \
++# --POPTargs=$"<option>"
+ #==============================================================================
+-rpmb alias --dbpath --define '_dbpath !#:+' \
+- --POPTdesc=$"use database in DIRECTORY" \
+- --POPTargs=$"DIRECTORY"
+-rpmb alias --ftpport --define '_ftpport !#:+'
+-rpmb alias --ftpproxy --define '_ftpproxy !#:+'
+-rpmb alias --httpport --define '_httpport !#:+'
+-rpmb alias --httpproxy --define '_httpproxy !#:+'
+-rpmb alias --timecheck --define '_timecheck !#:+'
+-rpmb alias --with --define "_with_!#:+ --with-!#:+" \
+- --POPTdesc=$"enable configure <option> for build" \
+- --POPTargs=$"<option>"
+-rpmb alias --without --define "_without_!#:+ --without-!#:+" \
+- --POPTdesc=$"disable configure <option> for build" \
+- --POPTargs=$"<option>"
++#rpmb alias --dbpath --define '_dbpath !#:+' \
++# --POPTdesc=$"use database in DIRECTORY" \
++# --POPTargs=$"DIRECTORY"
++#rpmb alias --ftpport --define '_ftpport !#:+'
++#rpmb alias --ftpproxy --define '_ftpproxy !#:+'
++#rpmb alias --httpport --define '_httpport !#:+'
++#rpmb alias --httpproxy --define '_httpproxy !#:+'
++#rpmb alias --timecheck --define '_timecheck !#:+'
++#rpmb alias --with --define "_with_!#:+ --with-!#:+" \
++# --POPTdesc=$"enable configure <option> for build" \
++# --POPTargs=$"<option>"
++#rpmb alias --without --define "_without_!#:+ --without-!#:+" \
++# --POPTdesc=$"disable configure <option> for build" \
++# --POPTargs=$"<option>"
+# Build policies enabled from command line. Last policy applies.
-+rpmb alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
-+
--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
-+
--POPTargs=$"<policy>"
++#rpmb alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+' \
++
# --POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
++
# --POPTargs=$"<policy>"
+
#==============================================================================
rpmbuild alias --dbpath --define '_dbpath !#:+' \
- --POPTdesc=$"use <dir> as the directory for the database" \
-@@ -228,6 +233,11 @@
+ --POPTdesc=$"use database in DIRECTORY" \
+@@ -226,6 +231,11 @@
rpmbuild alias --without --define "_without_!#:+ --without-!#:+" \
--POPTdesc=$"disable configure <option> for build" \
--POPTargs=$"<option>"
+
#==============================================================================
rpmd alias --dbpath --define '_dbpath !#:+' \
- --POPTdesc=$"use <dir> as the directory for the database" \
+ --POPTdesc=$"use database in DIRECTORY" \
---- ./lib/depends.c~org Wed Aug 1 22:14:31 2001
-+++ ./lib/depends.c Wed Aug 1 22:15:57 2001
+--- rpm-4.0.4/lib/depends.c~org Wed Aug 1 22:14:31 2001
++++ rpm-4.0.4/lib/depends.c Wed Aug 1 22:15:57 2001
@@ -335,18 +335,24 @@
for (dirNum = 0; dirNum < numDirs; dirNum++) {
dirNeedle.dirName = (char *) dirNames[dirNum];
done
fi
+requires_mod="`LC_ALL=C rpm -q --whatprovides --qf "%{NAME}\n" $requires_php_t 2>/dev/null`"
echo "$requires
-$requires_php"| grep -v "no package provides" | sort -u
+$requires_php
+$requires_mod"| grep -v "no package provides" | sort -u
---- ./lib/header.c.org Sun Feb 17 01:50:51 2002
-+++ ./lib/header.c Sun Feb 17 01:52:01 2002
-@@ -1282,8 +1282,8 @@
-
- }
+--- rpm-4.1/rpmdb/header.c.wiget2 Thu Sep 19 00:47:29 2002
++++ rpm-4.1/rpmdb/header.c Thu Sep 19 00:52:10 2002
+@@ -1645,7 +1645,8 @@
}
--
+ /*@=boundsread@*/
+
- return entry->data;
+/* when everything fail, try gettext */
+ return _(entry->data);
---- rpm-4.0.4/configure.in.wiget Tue Jul 9 15:02:48 2002
-+++ rpm-4.0.4/configure.in Tue Jul 9 15:08:14 2002
-@@ -1164,13 +1164,13 @@
-
- AC_CONFIG_SUBDIRS(popt beecrypt zlib $WITH_DB_SUBDIR)
-
--AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
-+AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec m4/Makefile
- macros.perl scripts/perl.req scripts/perl.prov
- macros.python macros.php scripts/php.req scripts/php.prov
- rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
- scripts/Makefile scripts/brp-redhat tools/Makefile
- tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
-- misc/Makefile po/Makefile.in intl/Makefile
-+ misc/Makefile po/Makefile.in
- doc/Makefile doc/manual/Makefile
- doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
- doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
---- rpm-4.0.4/Makefile.am.wiget Mon Feb 4 20:12:44 2002
-+++ rpm-4.0.4/Makefile.am Tue Jul 9 15:06:53 2002
-@@ -2,14 +2,14 @@
-
- AUTOMAKE_OPTIONS = 1.4 foreign
-
--EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
-+EXTRA_DIST = config.rpath CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
- RPM-GPG-KEY RPM-PGP-KEY \
- autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
- config.site db db3/configure gendiff installplatform platform* \
- Perl-RPM po/*.in po/*.po po/rpm.pot \
- rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
-
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = m4 po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-
- INCLUDES = \
- -I$(top_srcdir)/build \
-@@ -248,3 +248,5 @@
- @CSCOPE@ -b -R
-
- cref: ctags cscope
-+
-+ACLOCAL_AMFLAGS = -I m4
---- rpm-4.0.4/po/pt_BR.po.wiget Tue Jul 9 15:54:10 2002
-+++ rpm-4.0.4/po/pt_BR.po Tue Jul 9 15:55:41 2002
-@@ -5,6 +5,12 @@
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
-+"PO-Revision-Date: 2000-06-22 01:13+01:00\n"
-+"Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
-+"Language-Team: none <none@example.com>\n"
-+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
-+"Content-Transfer-Encoding: 8Bit\n"
-
- # , c-format
- #: build.c:39
---- rpm-4.0.4/po/cs.po.wiget Tue Jul 9 15:32:35 2002
-+++ rpm-4.0.4/po/cs.po Tue Jul 9 15:32:45 2002
-@@ -3110,7 +3110,7 @@
- #: lib/query.c:931
- #, c-format
- msgid "record %u could not be read\n"
--msgstr "záznam %d nelze pøeèíst\n"
-+msgstr "záznam %u nelze pøeèíst\n"
-
- #: lib/query.c:942 lib/rpminstall.c:632
- #, c-format
---- rpm-4.0.4/po/en_RN.po.wiget Tue Jul 9 15:33:28 2002
-+++ rpm-4.0.4/po/en_RN.po Tue Jul 9 15:34:56 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: en <en@example.com>\n"
-+"Language-Team: en <en@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/es.po.wiget Tue Jul 9 15:36:51 2002
-+++ rpm-4.0.4/po/es.po Tue Jul 9 15:38:03 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: es <es@li.org>\n"
-+"Language-Team: es <es@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/eu_ES.po.wiget Tue Jul 9 15:38:14 2002
-+++ rpm-4.0.4/po/eu_ES.po Tue Jul 9 15:43:02 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: eu <eu@li.org>\n"
-+"Language-Team: eu <eu@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/fr.po.wiget Tue Jul 9 15:43:11 2002
-+++ rpm-4.0.4/po/fr.po Tue Jul 9 15:44:16 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: fr <fr@li.org>\n"
-+"Language-Team: fr <fr@li.org>\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:39
- #, fuzzy, c-format
---- rpm-4.0.4/po/hu.po.wiget Tue Jul 9 15:44:36 2002
-+++ rpm-4.0.4/po/hu.po Tue Jul 9 15:45:44 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: hu <hu@li.org>\n"
-+"Language-Team: hu <hu@li.org>\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-2\n"
-+"Content-Transfer-Encoding: 8bit\n"
-
- #: build.c:39
- #, c-format
---- rpm-4.0.4/po/id.po.wiget Tue Jul 9 15:45:53 2002
-+++ rpm-4.0.4/po/id.po Tue Jul 9 15:47:01 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: id <id@li.org>\n"
-+"Language-Team: id <id@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/is.po.wiget Tue Jul 9 15:47:16 2002
-+++ rpm-4.0.4/po/is.po Tue Jul 9 15:47:53 2002
-@@ -3182,7 +3182,7 @@
- #: lib/rpminstall.c:370
- #, c-format
- msgid "cannot open Packages database in %s\n"
--msgstr "get ekki opnað pakka gagnagrunn í\n"
-+msgstr "get ekki opnað pakka gagnagrunn í %s\n"
-
- #: lib/rpminstall.c:393
- #, c-format
---- rpm-4.0.4/po/it.po.wiget Tue Jul 9 15:48:16 2002
-+++ rpm-4.0.4/po/it.po Tue Jul 9 15:50:35 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: it <it@li.org>\n"
-+"Language-Team: it <it@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/ja.po.wiget Tue Jul 9 15:51:37 2002
-+++ rpm-4.0.4/po/ja.po Tue Jul 9 15:52:11 2002
+--- rpm-4.1/po/ja.po.wiget Tue Sep 17 21:38:04 2002
++++ rpm-4.1/po/ja.po Thu Sep 19 00:57:45 2002
@@ -2,7 +2,6 @@
# Kanda Mitsru <kanda@nn.iij4u.or.jp>
# rpm message catalog
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-@@ -3600,7 +3599,7 @@
- #: lib/signature.c:325
- #, c-format
- msgid "PGP sig size: %d\n"
--msgstr "PGP ½ð̾¥µ¥¤¥º: %s\n"
-+msgstr "PGP ½ð̾¥µ¥¤¥º: %d\n"
-
- #: lib/signature.c:338 lib/signature.c:432
- #, fuzzy
---- rpm-4.0.4/po/pt.po.wiget Tue Jul 9 15:52:36 2002
-+++ rpm-4.0.4/po/pt.po Tue Jul 9 15:53:46 2002
-@@ -6,7 +6,7 @@
- "Last-Translator: José Nuno Coelho Sanarra Pires\n"
- "Language-Team: pt <kde@poli.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=iso-latin1\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
- "Content-Transfer-Encoding: none\n"
-
- #: build.c:39
-@@ -1476,12 +1476,12 @@
- #: build/files.c:2247
- #, c-format
- msgid "Couldn't exec %s: %s\n"
--msgstr "Não consegui executar o %s: %S\n"
-+msgstr "Não consegui executar o %s: %s\n"
-
- #: build/files.c:2252
- #, c-format
- msgid "Couldn't fork %s: %s\n"
--msgstr "Não consegui executar à parte o %s: &s\n"
-+msgstr "Não consegui executar à parte o %s: %s\n"
-
- #: build/files.c:2336
- #, c-format
-@@ -3907,7 +3907,7 @@
- #: rpmio/macro.c:716
- #, c-format
- msgid "Macro %%%s has illegal name (%%undefine)\n"
--msgstr "A macro %%%s tem um nome ilegal (%%%undefine)\n"
-+msgstr "A macro %%%s tem um nome ilegal (%%undefine)\n"
-
- #: rpmio/macro.c:828
- #, c-format
---- rpm-4.0.4/po/uk.po.wiget Tue Jul 9 16:00:10 2002
-+++ rpm-4.0.4/po/uk.po Tue Jul 9 16:00:02 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: uk <none@example.com>\n"
-+"Language-Team: uk <uk@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/wa.po.wiget Tue Jul 9 16:00:21 2002
-+++ rpm-4.0.4/po/wa.po Tue Jul 9 16:01:59 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: wa <none@exmaple.com>\n"
-+"Language-Team: wa <wa@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/zh.po.wiget Tue Jul 9 16:02:07 2002
-+++ rpm-4.0.4/po/zh.po Tue Jul 9 16:04:53 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: en <en@example.com>\n"
-+"Language-Team: en <en@li.org>\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:39
- #, c-format
---- rpm-4.0.4/po/zh_CN.GB2312.po.wiget Tue Jul 9 16:05:18 2002
-+++ rpm-4.0.4/po/zh_CN.GB2312.po Tue Jul 9 16:06:30 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: rpm 4.0.3\n"
- "POT-Creation-Date: 2002-02-14 12:28-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: none <none@example.com>\n"
-+"Language-Team: zh_CN <zh_CN@li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=CHARSET\n"
--"Content-Transfer-Encoding: ENCODING\n"
-+"Content-Type: text/plain; charset=GB2312\n"
-+"Content-Transfer-Encoding: 8bit\n"
-
- #: build.c:39
- #, c-format
---- rpm-4.0.4/popt/Makefile.am.wiget2 Tue Jul 9 16:32:32 2002
-+++ rpm-4.0.4/popt/Makefile.am Tue Jul 9 16:32:13 2002
-@@ -2,12 +2,12 @@
+--- rpm-4.1/popt/Makefile.am.wiget Sat Jul 20 21:04:08 2002
++++ rpm-4.1/popt/Makefile.am Thu Sep 19 00:57:45 2002
+@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = 1.4 foreign
testit.sh test-poptrc \
po/*.in po/*.po po/popt.pot \
popt.ps
-
--SUBDIRS = intl po
-+SUBDIRS = m4 po
-
- INCLUDES = -I$(top_srcdir)
-
-@@ -66,3 +66,5 @@
+@@ -74,3 +74,5 @@
rm -rf doxygen
mkdir -p doxygen
doxygen
+
+ACLOCAL_AMFLAGS = -I m4
---- rpm-4.0.4/popt/configure.in.wiget2 Tue Jul 9 16:32:42 2002
-+++ rpm-4.0.4/popt/configure.in Tue Jul 9 16:32:13 2002
-@@ -82,5 +82,5 @@
- AC_DEFINE_UNQUOTED(POPT_SOURCE_PATH, "$POPT_SOURCE_PATH")
- AC_SUBST(POPT_SOURCE_PATH)
-
--AC_OUTPUT([Doxyfile Makefile intl/Makefile po/Makefile.in],
-- [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
-+AC_OUTPUT([Doxyfile Makefile po/Makefile.in m4/Makefile ],
-+ [])
---- rpm-4.0.4/popt/po/de.po.wi2 Tue Jul 9 16:37:18 2002
-+++ rpm-4.0.4/popt/po/de.po Tue Jul 9 16:38:19 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/eu_ES.po.wi2 Tue Jul 9 16:39:24 2002
-+++ rpm-4.0.4/popt/po/eu_ES.po Tue Jul 9 16:39:49 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/fi.po.wi2 Tue Jul 9 16:39:58 2002
-+++ rpm-4.0.4/popt/po/fi.po Tue Jul 9 16:44:16 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/fr.po.wi2 Tue Jul 9 16:44:25 2002
-+++ rpm-4.0.4/popt/po/fr.po Tue Jul 9 16:45:24 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/id.po.wi2 Tue Jul 9 16:45:36 2002
-+++ rpm-4.0.4/popt/po/id.po Tue Jul 9 16:45:55 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/it.po.wi2 Tue Jul 9 16:46:03 2002
-+++ rpm-4.0.4/popt/po/it.po Tue Jul 9 16:46:25 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/ja.po.wi2 Tue Jul 9 16:46:35 2002
-+++ rpm-4.0.4/popt/po/ja.po Tue Jul 9 16:47:09 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/pl.po.wi2 Tue Jul 9 16:47:23 2002
-+++ rpm-4.0.4/popt/po/pl.po Tue Jul 9 16:47:45 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
+--- rpm-4.1/Makefile.am.wiget Mon Sep 16 23:40:53 2002
++++ rpm-4.1/Makefile.am Thu Sep 19 01:00:11 2002
+@@ -3,7 +3,7 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/pt_BR.po.wi2 Tue Jul 9 16:47:58 2002
-+++ rpm-4.0.4/popt/po/pt_BR.po Tue Jul 9 16:48:18 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\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"
+ EXTRA_DIST = CHANGES CREDITS Doxyheader GROUPS README.amiga INSTALL \
+- RPM-GPG-KEY RPM-PGP-KEY \
++ config.rpath RPM-GPG-KEY RPM-PGP-KEY \
+ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \
+ config.site db db3/configure gendiff installplatform platform* \
+ xmlspec/Makefile xmlspec/*.c xmlspec/*.h \
+@@ -261,3 +261,5 @@
+ @CSCOPE@ -b -R
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/sr.po.wi2 Tue Jul 9 16:48:25 2002
-+++ rpm-4.0.4/popt/po/sr.po Tue Jul 9 16:48:44 2002
-@@ -2,17 +2,16 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
+ cref: ctags cscope
++
++ACLOCAL_AMFLAGS = -I m4
+--- rpm-4.1/po/pt_BR.po.wrr Thu Sep 19 01:19:19 2002
++++ rpm-4.1/po/pt_BR.po Thu Sep 19 01:20:02 2002
+@@ -5,6 +5,9 @@
msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
--"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
--"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\n"
+ "Project-Id-Version: rpm 4.0.3\n"
+ "POT-Creation-Date: 2002-09-17 11:18-0400\n"
++"PO-Revision-Date: 2002-09-17 11:18-0400\n"
++"Last-Translator: x <x@xxx.xxx>\n"
++"Language-Team: x <xx@li.org>\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"
-
- #: popt.c:29
- msgid "unknown errno"
---- rpm-4.0.4/popt/po/zh.po.wi2 Tue Jul 9 16:48:55 2002
-+++ rpm-4.0.4/popt/po/zh.po Tue Jul 9 16:49:18 2002
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8-bit\n"
+--- rpm-4.1/po/fr.po.wrr Thu Sep 19 01:17:56 2002
++++ rpm-4.1/po/fr.po Thu Sep 19 01:18:57 2002
@@ -2,17 +2,16 @@
# Copyright (C) YEAR Free Software Foundation, Inc.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#, fuzzy
msgid ""
msgstr ""
- "Project-Id-Version: popt 1.6.3\n"
- "POT-Creation-Date: 2002-01-19 09:14-0500\n"
+ "Project-Id-Version: rpm 4.0.3\n"
+ "POT-Creation-Date: 2002-09-17 11:18-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-+"PO-Revision-Date: 2002-07-09 01:01+0000\n"
-+"Last-Translator: de <none@example.com>\n"
-+"Language-Team: de <de@li.org>\n"
++"PO-Revision-Date: 2002-09-17 11:18-0400\n"
++"Last-Translator: x <x@xxx.xxx>\n"
++"Language-Team: x <xx@li.org>\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"
- #: popt.c:29
- msgid "unknown errno"
+ #: build.c:40
+ #, fuzzy
---- rpm-4.0.2/lib/misc.c.glob Wed May 16 13:00:10 2001
-+++ rpm-4.0.2/lib/misc.c Wed May 16 15:35:28 2001
-@@ -583,6 +583,11 @@
+--- rpm-4.0.4/lib/misc.c.wiget Sun Jan 20 23:10:19 2002
++++ rpm-4.0.4/lib/misc.c Tue Feb 12 22:41:39 2002
+@@ -514,6 +514,11 @@
const char * path;
const char * globURL;
char * globRoot = NULL;
size_t maxb, nb;
glob_t gl;
int ut;
-@@ -593,6 +598,17 @@
+@@ -524,6 +529,17 @@
if (rc)
return rc;
for (j = 0; j < ac; j++) {
if (!myGlobPatternP(av[j])) {
if (argc == 0)
-@@ -667,6 +683,17 @@
+@@ -609,6 +625,16 @@
exit:
+#ifdef ENABLE_NLS
-+ if (old_collate) {
-+ setlocale(LC_COLLATE, old_collate);
-+ free(old_collate);
-+ }
-+ if (old_ctype) {
-+ setlocale(LC_CTYPE, old_ctype);
-+ free(old_ctype);
-+ }
++ if (old_collate) {
++ setlocale(LC_COLLATE, old_collate);
++ free(old_collate);
++ }
++ if (old_ctype) {
++ setlocale(LC_CTYPE, old_ctype);
++ free(old_ctype);
++ }
+#endif
-+
- if (av)
- free((void *)av);
- if ((rc || argvPtr == NULL) && argv) {
+ av = _free(av);
+ if (rc || argvPtr == NULL) {
+ if (argv != NULL)
#ifdef __cplusplus
extern "C" {
+@@ -702,7 +702,7 @@
+ {
+ if (data) {
+ /*@-branchstate@*/
+- if (type == -1 ||
++ if ((int)type == -1 ||
+ type == RPM_STRING_ARRAY_TYPE ||
+ type == RPM_I18NSTRING_TYPE ||
+ type == RPM_BIN_TYPE)
+@@ -713,7 +713,7 @@
+ }
+
+ #if !defined(__HEADER_PROTOTYPES__)
+-#include <hdrinline.h>
++#include "hdrinline.h"
+ #endif
+
+ #ifdef __cplusplus
---- rpm-4.0.1/installplatform.wiget Wed Jan 17 17:14:16 2001
-+++ rpm-4.0.1/installplatform Wed Jan 31 17:47:58 2001
-@@ -21,11 +21,12 @@
+--- rpm-4.0.4/installplatform.wiget Tue Feb 12 21:59:53 2002
++++ rpm-4.0.4/installplatform Tue Feb 12 22:31:13 2002
+@@ -21,12 +21,13 @@
RPM="./rpm --rcfile $TEMPRC"
-arch="`$RPM --eval '%{_arch}'`"
-+CHARCH='s_i.86_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_'
-+arch="`$RPM --eval '%{_arch}' | sed -e $CHARCH`"
++canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_'
++arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`"
VENDOR="`$RPM --eval '%{_vendor}'`"
OS="`$RPM --eval '%{_os}'`"
--target_platform="`$RPM --eval '%{_target_platform}'`"
+ RPMRC_GNU="`$RPM --eval '%{_gnu}'`"
+-target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`"
-target="`$RPM --eval '%{_target}'`"
-+target_platform="`$RPM --eval '%{_target_platform}' | sed -e $CHARCH`"
-+target="`$RPM --eval '%{_target}' | sed -e $CHARCH`"
++target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed -e "$canonarch_sed"`"
++target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`"
rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
-@@ -38,7 +39,6 @@
+@@ -34,13 +35,12 @@
+ ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
+
+ case "$arch" in
+- i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
++ i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
+ 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_' ;;
*) SUBSTS=y___ ;;
esac
--base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_'`
+-base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_'`
for SUBST in $SUBSTS ; do
ARCH=`echo $arch | sed -e $SUBST`
-@@ -86,7 +86,7 @@
+@@ -76,6 +76,7 @@
+ case $VENDOR in
+ pld)
+ VENDORSED='-e s,^@pld@,,'
++ RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
+ ;;
+ mandrake)
+ VENDORSED='-e s,^@mandrake@,,'
+@@ -91,12 +92,12 @@
cat $PLATFORM \
| sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
- -e "s,@RPMRC_ARCH@,$base_arch," \
-+ -e "s,@RPMRC_ARCH@,$arch," \
- -e "s,@LIB@,$LIB," \
- -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
- -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
---- rpm-4.0.2/installplatform.bug Tue Aug 28 11:40:56 2001
-+++ rpm-4.0.2/installplatform Tue Aug 28 11:41:15 2001
-@@ -90,7 +90,6 @@
++ -e "s,@RPMRC_ARCH@,$ARCH," \
+ -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
-e "s,@LIB@,$LIB," \
-e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
-e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
-- -e 's,\${,%{_,' \
+- -e '/FLAGS:-/!s,\${,%{_,' \
++ -e '/\${\w*:-/!s,\${,%{_,' \
$MULTILIBSED \
$VENDORSED \
| grep -v '^@' \
+
# Software written in Python language require Python with main version
# unchanged
-%define pyrequires_eq() Requires: %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
+%define pyrequires_eq() Requires: %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
+
-diff -urN rpm-4.0.2/build/parseChangelog.c rpm-4.0.2.patched/build/parseChangelog.c
---- rpm-4.0.2/build/parseChangelog.c Tue Jan 16 00:10:04 2001
-+++ rpm-4.0.2.patched/build/parseChangelog.c Sat Sep 1 15:11:55 2001
-@@ -213,7 +213,7 @@
+--- 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 @@
while (! (nextPart = isPart(spec->line))) {
appendStringBuf(sb, spec->line);
nextPart = PART_NONE;
break;
}
-diff -urN rpm-4.0.2/build/parseSpec.c rpm-4.0.2.patched/build/parseSpec.c
---- rpm-4.0.2/build/parseSpec.c Tue Jan 16 14:08:55 2001
-+++ rpm-4.0.2.patched/build/parseSpec.c Sat Sep 1 15:36:00 2001
-@@ -131,12 +131,16 @@
+--- 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 @@
ofi->readPtr = from;
/* Don't expand macros (eg. %define) in false branch of %if clause */
-- 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;
-- }
+ /* 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;
}
-@@ -241,86 +245,88 @@
+@@ -258,6 +262,7 @@
SKIPSPACE(s);
match = -1;
-- if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
-- const char *arch = rpmExpand("%{_target_cpu}", NULL);
-- s += 7;
-- match = matchTok(arch, s);
-- free((void *)arch);
-- } else if (! strncmp("%ifnarch", s, sizeof("%ifnarch")-1)) {
-- const char *arch = rpmExpand("%{_target_cpu}", NULL);
-- s += 8;
-- match = !matchTok(arch, s);
-- free((void *)arch);
-- } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
-- const char *os = rpmExpand("%{_target_os}", NULL);
-- s += 5;
-- match = matchTok(os, s);
-- free((void *)os);
-- } else if (! strncmp("%ifnos", s, sizeof("%ifnos")-1)) {
-- const char *os = rpmExpand("%{_target_os}", NULL);
-- s += 6;
-- match = !matchTok(os, s);
-- free((void *)os);
-- } else if (! strncmp("%if", s, sizeof("%if")-1)) {
-- s += 3;
-- match = parseExpressionBoolean(spec, s);
-- if (match < 0) {
-- rpmError(RPMERR_UNMATCHEDIF,
-- _("%s:%d: parseExpressionBoolean returns %d\n"),
-- ofi->fileName, ofi->lineNum, match);
-- return RPMERR_BADSPEC;
-- }
-- } else if (! strncmp("%else", s, sizeof("%else")-1)) {
-- s += 5;
-- if (! spec->readStack->next) {
-- /* Got an else with no %if ! */
-- rpmError(RPMERR_UNMATCHEDIF,
-- _("%s:%d: Got a %%else with no %%if\n"),
-- ofi->fileName, ofi->lineNum);
-- return RPMERR_UNMATCHEDIF;
-- }
-- spec->readStack->reading =
-- spec->readStack->next->reading && ! spec->readStack->reading;
-- spec->line[0] = '\0';
-- } else if (! strncmp("%endif", s, sizeof("%endif")-1)) {
-- s += 6;
-- if (! spec->readStack->next) {
-- /* Got an end with no %if ! */
-- rpmError(RPMERR_UNMATCHEDIF,
-- _("%s:%d: Got a %%endif with no %%if\n"),
-- ofi->fileName, ofi->lineNum);
-- return RPMERR_UNMATCHEDIF;
-- }
-- rl = spec->readStack;
-- spec->readStack = spec->readStack->next;
-- free(rl);
-- spec->line[0] = '\0';
-- } else if (! strncmp("%include", s, sizeof("%include")-1)) {
-- char *fileName, *endFileName, *p;
--
-- s += 8;
-- fileName = s;
-- if (! isspace(*fileName)) {
-- rpmError(RPMERR_BADSPEC, _("malformed %%include statement\n"));
-- return RPMERR_BADSPEC;
-- }
-- SKIPSPACE(fileName);
-- endFileName = fileName;
-- SKIPNONSPACE(endFileName);
-- p = endFileName;
-- SKIPSPACE(p);
-- if (*p != '\0') {
-- rpmError(RPMERR_BADSPEC, _("malformed %%include statement\n"));
-- return RPMERR_BADSPEC;
-- }
-- *endFileName = '\0';
+ if (! (strip & STRIP_NOEXPAND)) {
-+ if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
-+ const char *arch = rpmExpand("%{_target_cpu}", NULL);
-+ s += 7;
-+ match = matchTok(arch, s);
-+ free((void *)arch);
-+ } else if (! strncmp("%ifnarch", s, sizeof("%ifnarch")-1)) {
-+ const char *arch = rpmExpand("%{_target_cpu}", NULL);
-+ s += 8;
-+ match = !matchTok(arch, s);
-+ free((void *)arch);
-+ } else if (! strncmp("%ifos", s, sizeof("%ifos")-1)) {
-+ const char *os = rpmExpand("%{_target_os}", NULL);
-+ s += 5;
-+ match = matchTok(os, s);
-+ free((void *)os);
-+ } else if (! strncmp("%ifnos", s, sizeof("%ifnos")-1)) {
-+ const char *os = rpmExpand("%{_target_os}", NULL);
-+ s += 6;
-+ match = !matchTok(os, s);
-+ free((void *)os);
-+ } else if (! strncmp("%if", s, sizeof("%if")-1)) {
-+ s += 3;
-+ match = parseExpressionBoolean(spec, s);
-+ if (match < 0) {
-+ rpmError(RPMERR_UNMATCHEDIF,
-+ _("%s:%d: parseExpressionBoolean returns %d\n"),
-+ ofi->fileName, ofi->lineNum, match);
-+ return RPMERR_BADSPEC;
-+ }
-+ } else if (! strncmp("%else", s, sizeof("%else")-1)) {
-+ s += 5;
-+ if (! spec->readStack->next) {
-+ /* Got an else with no %if ! */
-+ rpmError(RPMERR_UNMATCHEDIF,
-+ _("%s:%d: Got a %%else with no %%if\n"),
-+ ofi->fileName, ofi->lineNum);
-+ return RPMERR_UNMATCHEDIF;
-+ }
-+ spec->readStack->reading =
-+ spec->readStack->next->reading && ! spec->readStack->reading;
-+ spec->line[0] = '\0';
-+ } else if (! strncmp("%endif", s, sizeof("%endif")-1)) {
-+ s += 6;
-+ if (! spec->readStack->next) {
-+ /* Got an end with no %if ! */
-+ rpmError(RPMERR_UNMATCHEDIF,
-+ _("%s:%d: Got a %%endif with no %%if\n"),
-+ ofi->fileName, ofi->lineNum);
-+ return RPMERR_UNMATCHEDIF;
-+ }
-+ rl = spec->readStack;
-+ spec->readStack = spec->readStack->next;
-+ free(rl);
-+ spec->line[0] = '\0';
-+ } else if (! strncmp("%include", s, sizeof("%include")-1)) {
-+ char *fileName, *endFileName, *p;
-+
-+ s += 8;
-+ fileName = s;
-+ if (! isspace(*fileName)) {
-+ rpmError(RPMERR_BADSPEC, _("malformed %%include statement\n"));
-+ return RPMERR_BADSPEC;
-+ }
-+ SKIPSPACE(fileName);
-+ endFileName = fileName;
-+ SKIPNONSPACE(endFileName);
-+ p = endFileName;
-+ SKIPSPACE(p);
-+ if (*p != '\0') {
-+ rpmError(RPMERR_BADSPEC, _("malformed %%include statement\n"));
-+ return RPMERR_BADSPEC;
-+ }
-+ *endFileName = '\0';
-
-- forceIncludeFile(spec, fileName);
-+ forceIncludeFile(spec, fileName);
-
-- ofi = spec->fileStack;
-- goto retry;
-+ ofi = spec->fileStack;
-+ goto retry;
-+ }
+ if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
+ const char *arch = rpmExpand("%{_target_cpu}", NULL);
+ s += 7;
+@@ -337,6 +342,7 @@
+ ofi = spec->fileStack;
+ goto retry;
}
--
-+
++ }
+
if (match != -1) {
- rl = xmalloc(sizeof(struct ReadLevelEntry));
- rl->reading = spec->readStack->reading && match;
-diff -urN rpm-4.0.2/build/rpmbuild.h rpm-4.0.2.patched/build/rpmbuild.h
---- rpm-4.0.2/build/rpmbuild.h Thu Jan 11 15:15:15 2001
-+++ rpm-4.0.2.patched/build/rpmbuild.h Sat Sep 1 15:11:55 2001
-@@ -69,6 +69,7 @@
+ 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 @@
#define STRIP_NOTHING 0
#define STRIP_TRAILINGSPACE (1 << 0)
#define STRIP_COMMENTS (1 << 1)
---- rpm-4.0.2/scripts/Makefile.am.wiget Tue Dec 12 17:47:59 2000
-+++ rpm-4.0.2/scripts/Makefile.am Fri Aug 10 12:44:47 2001
-@@ -9,7 +9,8 @@
- find-prov.pl find-req.pl cpanflute find-provides.perl \
- find-requires.perl get_magic.pl getpo.sh http.req \
+--- rpm-4.1/scripts/Makefile.am.wiget Thu Aug 22 19:31:42 2002
++++ rpm-4.1/scripts/Makefile.am Wed Sep 18 23:52:19 2002
+@@ -31,4 +31,5 @@
magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi \
-- trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh
-+ trpm u_pkg.sh vpkg-provides.sh vpkg-provides2.sh \
-+ find-perl-requires find-perl-provides
-
- installprefix = $(DESTDIR)
-
-@@ -23,4 +24,5 @@
- find-prov.pl find-req.pl cpanflute find-provides.perl \
- find-requires.perl get_magic.pl getpo.sh http.req \
- magic.prov magic.req perl.prov perl.req rpmdiff rpmdiff.cgi u_pkg.sh \
-- vpkg-provides.sh vpkg-provides2.sh
-+ vpkg-provides.sh vpkg-provides2.sh \
-+ find-perl-requires find-perl-provides
---- rpm-4.0.2/scripts/perl.prov.wiget Mon Jan 17 19:58:36 2000
-+++ rpm-4.0.2/scripts/perl.prov Fri Aug 10 12:44:47 2001
+ rpm.daily rpm.log rpm.xinetd rpm2cpio.sh \
+ sql.prov sql.req tcl.req tgpg trpm u_pkg.sh \
++ find-perl-requires find-perl-provides \
+ vpkg-provides.sh vpkg-provides2.sh
+--- rpm-4.1/scripts/perl.prov.wiget Fri Feb 1 16:20:26 2002
++++ rpm-4.1/scripts/perl.prov Wed Sep 18 23:50:15 2002
@@ -47,7 +47,9 @@
if ("@ARGV") {
}
}
---- rpm-4.0.2/scripts/perl.req.wiget Mon Jan 17 19:58:36 2000
-+++ rpm-4.0.2/scripts/perl.req Fri Aug 10 12:44:47 2001
+--- rpm-4.1/scripts/perl.req.wiget Mon Jun 3 22:56:33 2002
++++ rpm-4.1/scripts/perl.req Wed Sep 18 23:50:15 2002
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
-+#!@PERL@
++#!@__PERL@
# RPM (and it's source code) is covered under two separate licenses.
} else {
# I am not using rpm3.0 so I do not want spaces arround my
-@@ -183,7 +195,31 @@
+@@ -209,7 +221,31 @@
# will be included with the name sys/systeminfo.ph so only use the
# basename of *.ph files
-- ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
+- ($module =~ m/\.ph$/) && next;
+ # ($module =~ m/\.ph$/) && ($module =~ s!.*/!!g );
-+
++
+ # there is no need to generate dependencies for ph, pl or test files
+ # so let's just skip them.
+
+
+ $module =~ s/\(\s*\)$//;
-
$require{$module}=$version;
---- rpm-4.0.2/configure.in.wiget Sun Feb 25 18:13:26 2001
-+++ rpm-4.0.2/configure.in Fri Aug 10 12:48:21 2001
-@@ -186,6 +186,7 @@
- AC_PATH_PROG(__MKDIR, mkdir, /bin/mkdir, $MYPATH)
- AC_PATH_PROG(__MV, mv, /bin/mv, $MYPATH)
- AC_PATH_PROG(__PATCH, patch, /usr/bin/patch, $MYPATH)
-+ AC_PATH_PROG(PERL, perl, /usr/bin/perl, $MYPATH)
- AC_MSG_CHECKING(old version of patch)
- PATCHVERSION=`patch --version 2>&1`
-
-@@ -1086,6 +1087,7 @@
-
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
-+ macros.perl scripts/perl.req scripts/perl.prov
- rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
- scripts/Makefile
- tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
---- rpm-4.0.2/macros.in.wiget Fri Aug 10 12:44:47 2001
-+++ rpm-4.0.2/macros.in Fri Aug 10 12:44:47 2001
-@@ -626,9 +626,11 @@
- # %{perl_sitearch}/Image
+ $line{$module}=$_;
+--- rpm-4.1/configure.ac.wiget Thu Aug 22 19:01:34 2002
++++ rpm-4.1/configure.ac Wed Sep 18 23:50:46 2002
+@@ -1194,6 +1194,7 @@
+ AC_CONFIG_SUBDIRS(popt beecrypt zlib libelf db3)
+
+ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
++ macros.perl scripts/perl.req scripts/perl.prov
+ rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+ scripts/Makefile scripts/brp-redhat
+ scripts/macros.perl scripts/macros.php scripts/macros.python
+--- rpm-4.1/macros.in.wiget Sun Sep 1 00:30:19 2002
++++ rpm-4.1/macros.in Wed Sep 18 23:50:46 2002
+@@ -1012,8 +1012,10 @@
# %dir %{perl_sitearch}/auto/Image
#
+ %requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+-%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
+-%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
+#
+# NOTE: %{perl_sitearch}, %{perl_archlib} and %{perl_sitelib} macros
+# has been moved to macros.perl (see info in this file for details).
+#
- %requires_eq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}' %1| grep -v "is not")
--%perl_sitearch %(eval "`perl -V:installsitearch`"; echo $installsitearch)
--%perl_archlib %(eval "`perl -V:installarchlib`"; echo $installarchlib)
#------------------------------------------------------------------------------
# arch macro for all Intel i?86 compatibile processors
---- rpm-4.0/scripts/perl.req Mon Dec 16 11:36:15 2000
-+++ rpm-4.0.mis/scripts/perl.req Mon Dec 16 11:46:28 2000
+--- rpm-4.0.4/scripts/perl.req.wiget Tue Feb 12 21:49:36 2002
++++ rpm-4.0.4/scripts/perl.req Tue Feb 12 21:51:41 2002
@@ -61,6 +61,11 @@
}
}
foreach $module (sort keys %require) {
if (length($require{$module}) == 0) {
-@@ -82,6 +86,53 @@
+@@ -82,6 +87,53 @@
exit 0;
sub process_file {
-@@ -90,6 +141,8 @@
+@@ -90,6 +142,8 @@
- open(FILE, "<$file")||
- die("$0: Could not open file: '$file' : $!\n");
-+
-+ return if (!is_perlfile($file, \*FILE));
+ open(FILE, "<$file") || return;
++ return if (!is_perlfile($file, \*FILE));
++
while (<FILE>) {
-@@ -112,6 +165,10 @@
+ # skip the documentation
+@@ -111,6 +165,10 @@
last;
}
# Each keyword can appear multiple times. Don't
# bother with datastructures to store these strings,
# if we need to print it print it now.
-@@ -209,6 +266,10 @@
- # if the module name starts in a dot it is not a module name.
+@@ -229,6 +287,10 @@
($module =~ m/^\./) && next;
-+
+
+ # name starts in a non alphanumeric character it is not a module
+ # name.
+ ($module =~ m/^\W/) && next;
-
++
# if the module ends with .pm strip it to leave only basename.
+ $module =~ s/\.pm$//;
---- rpm-4.0.2/python/Makefile.am.orig Mon Jun 19 01:26:50 2000
-+++ rpm-4.0.2/python/Makefile.am Sun Sep 9 00:41:37 2001
-@@ -25,5 +25,5 @@
+--- rpm-4.0.4/python/Makefile.am.wiget2 Tue Feb 12 23:20:17 2002
++++ rpm-4.0.4/python/Makefile.am Tue Feb 12 23:21:09 2002
+@@ -34,10 +34,10 @@
noinst_LTLIBRARIES = librpmmodule.la
librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c
-rpmmodule.so: $(librpmmodule_la_OBJECTS)
+rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
- $(LINK) -o $@ $^ $(rpmmodule_so_LDFLAGS)
+ $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
+
+-poptmodule.so: $(poptmodule_so_OBJECTS)
++poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS)
+ $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
+
+ .PHONY: lclint
---- configure.in Sun Nov 11 16:16:04 2001
-+++ configure.in.new Sun Nov 11 16:14:58 2001
-@@ -1087,6 +1087,7 @@
- AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec scripts/brp-redhat
- macros.perl scripts/perl.req scripts/perl.prov
+--- rpm-4.0.4/configure.ac.wiget Tue Feb 12 23:26:36 2002
++++ rpm-4.0.4/configure.ac Tue Feb 12 23:27:46 2002
+@@ -1166,6 +1166,7 @@
+
+ AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec
+ macros.perl scripts/perl.req scripts/perl.prov
+ macros.python macros.php scripts/php.req scripts/php.prov
- rpmio/Makefile lib/Makefile build/Makefile tools/Makefile
- scripts/Makefile
+ rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
+ scripts/Makefile scripts/brp-redhat tools/Makefile
tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
rpm alias --buildpolicy --define '__os_install_post @RPMCONFIGDIR@/brp-!#:+'
+# Make RPM build tree
-+rpm exec --install-build-tree install-build-tree
++rpm exec --install-build-tree install-build-tree \
++ --POPTdesc=$"make all needed dirs for building binary rpms"
+
+# Compiling with debuginfo may be enabled by --debug
-+rpm alias --debug --define 'debug 1'
++rpm alias --debug --define 'debug 1' \
++ --POPTdesc=$"build packages with debug informations"
++rpmb alias --debug --define 'debug 1' \
++ --POPTdesc=$"build packages with debug informations"
++rpmbuild alias --debug --define 'debug 1' \
++ --POPTdesc=$"build packages with debug informations"
+
+# Conditional building
-+rpm exec --bcond find-spec-bcond
-+rpm alias --with --define "_with_!#:+ --with-!#:+"
-+rpm alias --without --define "_without_!#:+ --without-!#:+"
-+rpmb alias --with --define "_with_!#:+ --with-!#:+"
-+rpmb alias --without --define "_without_!#:+ --without-!#:+"
-+
-+# Don't remove $BUILDROOT if --noclean
-+
++rpm exec --bcond find-spec-bcond \
++ --POPTdesc=$"find all --with/--without values"
# Choose db interface:
# 0 same as 1
# 1 native db1 interface (e.g. linux glibc libdb1 routines).
-diff -Nur rpm-4.0.2.orig/lib/rpminstall.c rpm-4.0.2/lib/rpminstall.c
---- rpm-4.0.2.orig/lib/rpminstall.c Sat Feb 10 15:07:16 2001
-+++ rpm-4.0.2/lib/rpminstall.c Sun Sep 9 00:33:52 2001
-@@ -87,6 +87,13 @@
- case RPMCALLBACK_INST_OPEN_FILE:
- fd = Fopen(filename, "r.ufdio");
- fd = fdLink(fd, "persist (showProgress)");
-+ {
-+ int oldfl=Fcntl(fd, F_GETFD, 0);
-+ if(oldfl >= 0) {
-+ oldfl |= FD_CLOEXEC; /* scripts shouldn't inherit rpm file descriptor */
-+ Fcntl(fd, F_SETFD, oldfl);
-+ }
-+ }
- return fd;
-
- case RPMCALLBACK_INST_CLOSE_FILE:
-diff -Nur rpm-4.0.2.orig/lib/uninstall.c rpm-4.0.2/lib/uninstall.c
---- rpm-4.0.2.orig/lib/uninstall.c Mon Jan 22 16:59:13 2001
-+++ rpm-4.0.2/lib/uninstall.c Sat Sep 8 23:58:22 2001
-@@ -388,6 +388,9 @@
- if (Fileno(ts->scriptFd) > STDERR_FILENO) {
- Fclose (ts->scriptFd);
+--- rpm-4.1/lib/rpminstall.c.wiget Mon Sep 16 21:06:08 2002
++++ rpm-4.1/lib/rpminstall.c Thu Sep 19 00:03:36 2002
+@@ -126,8 +126,15 @@
+ xx = Fclose(fd);
+ fd = NULL;
}
+- } else
+ } else {
-+ if (Fileno(out) > STDERR_FILENO)
-+ Fclose (out);
- }
-
- { const char *ipath = rpmExpand("PATH=%{_install_script_path}", NULL);
++ int oldfl;
+ fd = fdLink(fd, "persist (showProgress)");
++ oldfl=Fcntl(fd, F_GETFD, 0);
++ if(oldfl >= 0) {
++ oldfl |= FD_CLOEXEC; /* scripts shouldn't inherit rpm file descriptor */
++ Fcntl(fd, F_SETFD, oldfl);
++ }
++ }
+ /*@=type@*/
+ return fd;
+ /*@notreached@*/ break;
# PLD rpm macros
-%_defaultdocdir %{_usr}/share/doc
+%__id @__ID@
+%__id_u %{__id} -u
+%__chown_Rhf @__CHOWN_RHF@
+%__chgrp_Rhf @__CHGRP_RHF@
+
%_fixowner [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root.@ROOT_GROUP@
%_fixgroup true
+%_fixperms %{__chmod} -Rf @FIXPERMS@
%_topdir %(echo $HOME)/rpm
%_exec_prefix %{_prefix}
%_bindir %{_exec_prefix}/bin
%_sbindir %{_exec_prefix}/sbin
%_libexecdir %{_exec_prefix}/lib
%_datadir %{_prefix}/share
-%_sharedstatedir %{_prefix}/com
+%_sharedstatedir /var/lib
%_lib lib
%_libdir %{_exec_prefix}/%{_lib}
%_includedir %{_prefix}/include
%_localstatedir /var
%_infodir /usr/share/info
%_mandir %{_prefix}/share/man
+%_defaultdocdir %{_usr}/share/doc
#-----------------------------------------------------------------
# CFLAGS and LDFLAGS used to build
-%debugcflags -O0 -g
+%debugcflags -O0 -g -Wall
%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}
%rpmldflags %{!?debug:-s}
# kernel compiler
-%kgcc gcc
-%kgcc_package gcc
+%kgcc gcc2
+%kgcc_package gcc2
-#-----------------------------------------------------------------
# Build system path macros.
#
%__libtoolize libtoolize --copy --force
CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \
%{?__cc:CC=%{__cc} ; export CC ; } \
%{?__cxx:CXX=%{__cxx} ; export CXX ; } \
- %{?configuredir:%{configuredir}}%{?!configuredir:.}/configure \
+ %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
--host=%{_target_platform} \
--prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} \
%_kernelsrcdir /usr/src/linux
# If non-empty "debug" macro defined, add "dbg" suffix to release number
-%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
+%_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
-# requires name = version-release
-%requires_releq() %(LC_ALL="C" rpm -q --queryformat 'Requires:%%{NAME} = %%{VERSION}-%%{RELEASE}' %1| grep -v "is not")
-%requires_kernel_releq() %(LC_ALL="C" rpm -q --queryformat 'Prereq:kernel = %%{VERSION}-%%{RELEASE}' kernel-headers | grep -v "is not")
-%requires_releq_kernel_up() %(LC_ALL="C" rpm -q --queryformat 'Prereq:kernel-up = %%{VERSION}-%%{RELEASE}' kernel-headers | grep -v "is not")
-%requires_releq_kernel_smp() %(LC_ALL="C" rpm -q --queryformat 'Prereq:kernel-smp = %%{VERSION}-%%{RELEASE}' kernel-headers | grep -v "is not")
+# Requires name = version-release
+%requires_releq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
+%requires_releq_kernel_up() %(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)")
+%requires_releq_kernel_smp() %(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)")
# kernel version-release handling
%__kernel_ver %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
%__spec_install_post_strip {%{!?debug: \
%{!?no_install_post_strip: \
%{?verbose:set -x;} \
- echo "Strip executable binaries and shared object files."; \
+ echo "Strip executable binaries, archives and shared object files."; \
filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"`; \
elfexelist=`echo $filelist | xargs -r file | \
awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
elfsharedlist=`echo $filelist | xargs -r file | \
awk '/LF.*shared object/ {print $1}' | cut -d: -f1`; \
+ elfarchiveslist=`echo $filelist | xargs -r file | \
+ awk '/current ar archive/ {print $1}' | cut -d: -f1`; \
if [ -n "$elfexelist" ]; then \
strip --remove-section=.note --remove-section=.comment $elfexelist; \
fi; \
if [ -n "$elfsharedlist" ]; then \
strip --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \
+ fi; \
+ if [ -n "$elfarchiveslist" ]; then \
+ strip --strip-debug --remove-section=.note --remove-section=.comment $elfarchiveslist; \
fi; } \
} }
-#-----------------------------------------------------------------
-# remove all RPATH from executable binaries and shared object files
-#
-# Requires: find, awk, strip, cut, xargs
-#
-#%no_install_post_chrpath 1
-%__spec_install_post_chrpath {%{!?debug: \
-%{!?no_install_post_chrpath: \
- %{?verbose:set -x;} \
- echo "Remove RPATH from executable binaries and shared object files."; \
- filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"`; \
- elfexelist=`echo $filelist | xargs -r file | \
- awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
- elfsharedlist=`echo $filelist | xargs -r file | \
- awk '/LF.*shared object/ {print $1}' | cut -d: -f1`; \
- if [ -n "$elfexelist$elfsharedlist" ]; then \
- chrpath -d $elfexelist $elfsharedlist; \
- fi; } \
-} }
+
#-----------------------------------------------------------------
# Find and gzip all kernel modules
#
# - autodeps exceptions
# - compress all man and info pages,
# - strip all ELF executables and ELF shared objects if not %debug.
+# - compress kernel modules if any
###################################################################
# Requires/Provides automation
%{?_noautoprovfiles:for f in %{_noautoprovfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoprovfiles ; done }\
%{?_noautoprov:for f in %{_noautoprov} ; do echo "$f" >> %{_builddir}/__rpm_noautoprov ; done }\
%{__spec_install_post_strip}\
-%{__spec_install_post_chrpath}\
%{__spec_install_post_compress_docs}\
%{__spec_install_post_compress_modules}\
%{__arch_install_post}\
#%_noautoreqdep %{nil}
#%_noautoprovfiles %{nil}
#%_noautoprov %{nil}
+%_missing_doc_files_terminate_build 1%{nil}
+%_unpackaged_files_terminate_build %{nil}
projects / packages / rpm.git / commitdiff