From d5a81771b690eca36a7b4efde27ef874204452c9 Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 12 Dec 2002 19:16:45 +0000 Subject: [PATCH] - fix: add rpmlib(VersionedDependencies) if versioned Provides: found. CVS patchset: 5937 CVS date: 2002/12/12 19:16:45 --- CHANGES | 1 + build/parseReqs.c | 2 +- build/rpmfc.c | 14 ++++++++++++++ build/rpmfc.h | 5 +++-- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/is.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/no.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/rpm.pot | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sl.po | 4 ++-- po/sr.po | 2 +- po/sv.po | 2 +- po/tr.po | 2 +- rpm.spec.in | 5 ++++- tools/rpmdeps.c | 2 +- 27 files changed, 46 insertions(+), 27 deletions(-) diff --git a/CHANGES b/CHANGES index a865a0711..ff8cf272b 100644 --- a/CHANGES +++ b/CHANGES @@ -43,6 +43,7 @@ - internal automagic dependency generation (disabled for now). - don't generate dependencies unless execute bit is set. - enable internal automagic dependency generation as default. + - fix: add rpmlib(VersionedDependencies) if versioned Provides: found. 4.0.4 -> 4.1: - loosely wire beecrypt library into rpm. diff --git a/build/parseReqs.c b/build/parseReqs.c index 0290febe4..46feb9508 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -153,7 +153,7 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag, case RPMTAG_PROVIDEFLAGS: case RPMTAG_OBSOLETEFLAGS: /* Add prereq on rpmlib that has versioned dependencies. */ - if (!rpmExpandNumeric("%{_noVersionedDependencies}")) + if (!rpmExpandNumeric("%{?_noVersionedDependencies}")) (void) rpmlibNeedsFeature(h, "VersionedDependencies", "3.0.3-1"); /*@switchbreak@*/ break; default: diff --git a/build/rpmfc.c b/build/rpmfc.c index 427c4789f..a3e7621a4 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -389,7 +389,20 @@ assert(EVR != NULL); } /*@=branchstate@*/ + + /* Add tracking dependency for versioned Provides: */ + if (!fc->tracked && deptype == 'P' && *EVR != '\0') { + this = rpmdsSingle(RPMTAG_REQUIRENAME, + "rpmlib(VersionedDependencies)", "3.0.3-1", + RPMSENSE_RPMLIB|(RPMSENSE_LESS|RPMSENSE_EQUAL)); + xx = rpmdsMerge(&fc->requires, this); + this = rpmdsFree(this); + fc->tracked = 1; + } + this = rpmdsSingle(tagN, N, EVR, Flags); + + /* Add to package dependencies. */ xx = rpmdsMerge(depsp, this); /* Add to file dependencies. */ @@ -1355,6 +1368,7 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg) fc = rpmfcNew(); fc->skipProv = !pkg->autoProv; fc->skipReq = !pkg->autoReq; + fc->tracked = 0; /* Copy (and delete) manually generated dependencies to dictionary. */ if (!fc->skipProv) { diff --git a/build/rpmfc.h b/build/rpmfc.h index 984cc99b9..4413d2047 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -19,8 +19,9 @@ struct rpmfc_s { int fknown; /*!< no. of classified files */ int fwhite; /*!< no. of "white" files */ int ix; /*!< current file index */ - int skipProv; /*!< don't auto-generate Provides:? */ - int skipReq; /*!< don't auto-generate Requires:? */ + int skipProv; /*!< Don't auto-generate Provides:? */ + int skipReq; /*!< Don't auto-generate Requires:? */ + int tracked; /*!< Versioned Provides: tracking dependency added? */ ARGV_t fn; /*!< (#files) file names */ ARGI_t fcolor; /*!< (#files) file colors */ diff --git a/po/cs.po b/po/cs.po index a88e73dc6..73b93489f 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-07-24 10:02+0100\n" "Last-Translator: Milan Kerslager \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index ad4389d54..577dc19c6 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-04-05 23:03GMT\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index 4a7246fe4..3ad1ed9ca 100644 --- a/po/de.po +++ b/po/de.po @@ -37,7 +37,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 1998-08-03 18:02+02:00\n" "Last-Translator: Karl Eichwalder \n" "Language-Team: German \n" diff --git a/po/fi.po b/po/fi.po index 963b7be8f..23a0f8461 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 1998-05-02 21:41:47-0400\n" "Last-Translator: Raimo Koski \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index 2d3fcb3a8..6909402f3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/gl.po b/po/gl.po index c3a54f412..8a51c0c87 100644 --- a/po/gl.po +++ b/po/gl.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.1\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-01-13 22:31+0100\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" diff --git a/po/is.po b/po/is.po index 73f6198ed..efa93f41e 100644 --- a/po/is.po +++ b/po/is.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-07-12 13:25+0000\n" "Last-Translator: Richard Allen \n" "Language-Team: is \n" diff --git a/po/ja.po b/po/ja.po index 394feb96f..f389b2b31 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 1999-12-01 22:49 +JST\n" "Last-Translator: Kanda Mitsuru \n" "Language-Team: JRPM \n" diff --git a/po/ko.po b/po/ko.po index 5fd110ac0..bceadb816 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.4\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2002-03-04 17:17+0900\n" "Last-Translator: Jong-Hoon Ryu \n" "Language-Team: GNU Translation project \n" diff --git a/po/no.po b/po/no.po index a8b9d03aa..310cff589 100644 --- a/po/no.po +++ b/po/no.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-06-27 12:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" diff --git a/po/pl.po b/po/pl.po index 65fdd63ab..c191daa3a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 1999-05-25 17:00+0100\n" "Last-Translator: Pawe³ Dziekoñski \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 30d1efb1a..51ac8e38c 100644 --- a/po/pt.po +++ b/po/pt.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2002-02-14 10:51+0000\n" "Last-Translator: José Nuno Coelho Sanarra Pires \n" "Language-Team: pt \n" "Language-Team: Romanian \n" diff --git a/po/rpm.pot b/po/rpm.pot index a6ff5085f..3bb5c7bd0 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru.po b/po/ru.po index 1822fcf76..03d5f0ed2 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2002-08-27 13:36-0400\n" "Last-Translator: Eugene Kanter, \n" "Language-Team: Black Cat Linux Team \n" diff --git a/po/sk.po b/po/sk.po index 21a8054ee..665dcc919 100644 --- a/po/sk.po +++ b/po/sk.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 1999-04-08 21:37+02:00\n" "Last-Translator: Stanislav Meduna \n" "Language-Team: Slovak \n" diff --git a/po/sl.po b/po/sl.po index f4440d193..2ef82f7ab 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,12 +1,12 @@ # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr. # Copyright (C) 2000 Free Software Foundation, Inc. # Primo¾ Peterlin , 2000. -# $Id: sl.po,v 1.333 2002/12/10 16:35:37 jbj Exp $ +# $Id: sl.po,v 1.334 2002/12/12 19:17:21 jbj Exp $ # msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2000-10-08 19:05+0200\n" "Last-Translator: Grega Fajdiga \n" "Language-Team: Slovenian \n" diff --git a/po/sr.po b/po/sr.po index caed0fd6e..06717a789 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/po/sv.po b/po/sv.po index 81af98ebb..f50ff7366 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.1\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2002-08-19 22:26+0200\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index 93c2a1670..9c7b11a5b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: rpm 4.0.3\n" -"POT-Creation-Date: 2002-12-10 11:33-0500\n" +"POT-Creation-Date: 2002-12-12 13:12-0500\n" "PO-Revision-Date: 2001-07-05 08:02+300\n" "Last-Translator: Nilgun Belma Buguner \n" "Language-Team: Turkish \n" diff --git a/rpm.spec.in b/rpm.spec.in index 2ee414a59..566830d04 100644 --- a/rpm.spec.in +++ b/rpm.spec.in @@ -16,7 +16,7 @@ Name: rpm %define version @VERSION@ Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 0.22 +Release: 0.23 Group: System Environment/Base Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz Copyright: GPL @@ -459,6 +459,9 @@ exit 0 %{__prefix}/include/popt.h %changelog +* Thu Dec 12 2002 Jeff Johnson 4.2-0.23 +- fix: add rpmlib(VersionedDependencies) if versioned Provides: found. + * Wed Dec 11 2002 Jeff Johnson 4.2-0.22 - rebuild against glibc with TLS support. diff --git a/tools/rpmdeps.c b/tools/rpmdeps.c index 0dfbf94c4..fa9e52426 100644 --- a/tools/rpmdeps.c +++ b/tools/rpmdeps.c @@ -2,6 +2,7 @@ #include #include +#include #include #include "debug.h" @@ -53,7 +54,6 @@ main(int argc, char *const argv[]) int ec = 1; int xx; char buf[BUFSIZ]; -int i; /*@-modobserver@*/ if ((progname = strrchr(argv[0], '/')) != NULL)