- fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
authorjbj <devnull@localhost>
Thu, 12 Dec 2002 19:16:45 +0000 (19:16 +0000)
committerjbj <devnull@localhost>
Thu, 12 Dec 2002 19:16:45 +0000 (19:16 +0000)
CVS patchset: 5937
CVS date: 2002/12/12 19:16:45

27 files changed:
CHANGES
build/parseReqs.c
build/rpmfc.c
build/rpmfc.h
po/cs.po
po/da.po
po/de.po
po/fi.po
po/fr.po
po/gl.po
po/is.po
po/ja.po
po/ko.po
po/no.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/rpm.pot
po/ru.po
po/sk.po
po/sl.po
po/sr.po
po/sv.po
po/tr.po
rpm.spec.in
tools/rpmdeps.c

diff --git a/CHANGES b/CHANGES
index a865a07..ff8cf27 100644 (file)
--- 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.
index 0290feb..46feb95 100644 (file)
@@ -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:
index 427c478..a3e7621 100644 (file)
@@ -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) {
index 984cc99..4413d20 100644 (file)
@@ -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 */
index a88e73d..73b9348 100644 (file)
--- 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 <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
index ad4389d..577dc19 100644 (file)
--- 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 <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
index 4a7246f..3ad1ed9 100644 (file)
--- 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 <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
index 963b7be..23a0f84 100644 (file)
--- 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 <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
index 2d3fcb3..6909402 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
index c3a54f4..8a51c0c 100644 (file)
--- 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 <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
index 73f6198..efa93f4 100644 (file)
--- 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 <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
index 394feb9..f389b2b 100644 (file)
--- 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 <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
index 5fd110a..bceadb8 100644 (file)
--- 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 <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
index a8b9d03..310cff5 100644 (file)
--- 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 <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
index 65fdd63..c191daa 100644 (file)
--- 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 <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
index 30d1efb..51ac8e3 100644 (file)
--- 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 <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
index 140114b..ea633af 100644 (file)
@@ -4,7 +4,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-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
index 448f52c..cef8311 100644 (file)
--- a/po/ro.po
+++ b/po/ro.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-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
index a6ff508..3bb5c7b 100644 (file)
@@ -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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
index 1822fcf..03d5f0e 100644 (file)
--- 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, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
index 21a8054..665dcc9 100644 (file)
--- 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 <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
index f4440d1..2ef82f7 100644 (file)
--- 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 <primoz.peterlin@biofiz.mf.uni-lj.si>, 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 <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
index caed0fd..06717a7 100644 (file)
--- 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"
index 81af98e..f50ff73 100644 (file)
--- 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 <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
index 93c2a16..9c7b11a 100644 (file)
--- 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 <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
index 2ee414a..566830d 100644 (file)
@@ -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 <jbj@redhat.com> 4.2-0.23
+- fix: add rpmlib(VersionedDependencies) if versioned Provides: found.
+
 * Wed Dec 11 2002 Jeff Johnson <jbj@redhat.com> 4.2-0.22
 - rebuild against glibc with TLS support.
 
index 0dfbf94..fa9e524 100644 (file)
@@ -2,6 +2,7 @@
 
 #include <rpmbuild.h>
 #include <argv.h>
+#include <rpmds.h>
 #include <rpmfc.h>
 
 #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)