folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: add rpmlib(VersionedDependencies) if versioned Provides: found. 

CVS patchset: 5937
CVS date: 2002/12/12 19:16:45
This commit is contained in:
jbj 2002-12-12 19:16:45 +00:00
parent 8681309f1a
commit d5a81771b6
27 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -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.

2
build/parseReqs.c
View 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:

14
build/rpmfc.c
View 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) {

5
build/rpmfc.h
View 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 */

2
po/cs.po
View File

@ -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"

2
po/da.po
View File

@ -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"

2
po/de.po
View File

@ -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"

2
po/fi.po
View File

@ -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"

2
po/fr.po
View File

@ -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"

2
po/gl.po
View File

@ -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"

2
po/is.po
View File

@ -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"

2
po/ja.po
View File

@ -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"

2
po/ko.po
View File

@ -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"

2
po/no.po
View File

@ -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"

2
po/pl.po
View File

@ -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"

2
po/pt.po
View File

@ -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"

2
po/pt_BR.po
View 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"

2
po/ro.po
View File

@ -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"

2
po/rpm.pot
View 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"

2
po/ru.po
View File

@ -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"

2
po/sk.po
View File

@ -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"

4
po/sl.po
View File

@ -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"

2
po/sr.po
View File

@ -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"

2
po/sv.po
View File

@ -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"

2
po/tr.po
View File

@ -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"

5
rpm.spec.in
View 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.

2
tools/rpmdeps.c
View 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)