From b27a7971eb4f2c83fcebac447916e396dcbcc5be Mon Sep 17 00:00:00 2001 From: jbj Date: Thu, 22 Jul 1999 23:01:31 +0000 Subject: [PATCH] the death of RPMSENSE_SERIAL, use [epoch:]version[-release] instead. CVS patchset: 3200 CVS date: 1999/07/22 23:01:31 --- CHANGES | 1 + lib/depends.c | 5 ----- lib/formats.c | 4 ---- lib/problems.c | 4 ---- lib/rpmlib.h | 2 +- po/rpm.pot | 36 ++++++++++++++++++------------------ 6 files changed, 20 insertions(+), 32 deletions(-) diff --git a/CHANGES b/CHANGES index d15bb88..1abe65b 100644 --- a/CHANGES +++ b/CHANGES @@ -14,6 +14,7 @@ - add versions to provides. - fix: sanity test on specfile fails when encountering i18n chars. - print all dependencies for each package at end of build. + - the death of RPMSENSE_SERIAL, use [epoch:]version[-release] instead. 3.0.1 -> 3.0.2 - eliminate armv4 entries from rpmrc (Andrew E. Mileski). diff --git a/lib/depends.c b/lib/depends.c index 749577c..91b6859 100644 --- a/lib/depends.c +++ b/lib/depends.c @@ -506,11 +506,6 @@ int headerMatchesDepFlags(Header h, const char *reqName, const char * reqInfo, i /* Get package information from header */ headerGetEntry(h, RPMTAG_EPOCH, &type, (void **) &epochval, &count); if (epochval == NULL) { -#if defined(RPMSENSE_SERIAL) - /* XXX old behavior looks fishy */ - if (reqFlags & RPMSENSE_SERIAL) - return 0; -#endif /* RPMSENSE_SERIAL */ epoch = "0"; /* assume package is epoch 0 */ } else { sprintf(buf, "%d", *epochval); diff --git a/lib/formats.c b/lib/formats.c index b403995..e2de266 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -144,10 +144,6 @@ static char * depflagsFormat(int_32 type, const void * data, strcat(buf, ">"); if (anint & RPMSENSE_EQUAL) strcat(buf, "="); -#if defined(RPMSENSE_SERIAL) - if (anint & RPMSENSE_SERIAL) - strcat(buf, "S"); -#endif /* RPMSENSE_SERIAL */ val = malloc(5 + padding); strcat(formatPrefix, "s"); diff --git a/lib/problems.c b/lib/problems.c index 4216045..86274ea 100644 --- a/lib/problems.c +++ b/lib/problems.c @@ -18,10 +18,6 @@ void printDepFlags(FILE * fp, const char * version, int flags) fprintf(fp, ">"); if (flags & RPMSENSE_EQUAL) fprintf(fp, "="); -#if defined(RPMSENSE_SERIAL) - if (flags & RPMSENSE_SERIAL) - fprintf(fp, "S"); -#endif /* RPMSENSE_SERIAL */ if (flags) fprintf(fp, " %s", version); diff --git a/lib/rpmlib.h b/lib/rpmlib.h index 58b7956..9f7b48f 100644 --- a/lib/rpmlib.h +++ b/lib/rpmlib.h @@ -176,7 +176,7 @@ extern const struct headerSprintfExtension rpmHeaderFormats[]; #define RPMVERIFY_ALL ~(RPMVERIFY_NONE) #define RPMSENSE_ANY 0 -#define RPMSENSE_SERIAL (1 << 0) +#define RPMSENSE_SERIAL (1 << 0) /* eliminated, backward compatibilty */ #define RPMSENSE_LESS (1 << 1) #define RPMSENSE_GREATER (1 << 2) #define RPMSENSE_EQUAL (1 << 3) diff --git a/po/rpm.pot b/po/rpm.pot index 435fc2f..e12420f 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-07-22 18:35-0400\n" +"POT-Creation-Date: 1999-07-22 18:58-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1983,31 +1983,31 @@ msgstr "" msgid "error removing record %s into %s" msgstr "" -#: ../lib/depends.c:557 +#: ../lib/depends.c:552 msgid "dbrecMatchesDepFlags() failed to read header" msgstr "" -#: ../lib/depends.c:599 +#: ../lib/depends.c:594 #, c-format msgid "dependencies: looking for %s\n" msgstr "" -#: ../lib/depends.c:724 +#: ../lib/depends.c:719 #, c-format msgid "package %s require not satisfied: %s\n" msgstr "" -#: ../lib/depends.c:763 +#: ../lib/depends.c:758 #, c-format msgid "package %s conflicts: %s\n" msgstr "" -#: ../lib/depends.c:816 ../lib/depends.c:1119 +#: ../lib/depends.c:811 ../lib/depends.c:1114 #, c-format msgid "cannot read header at %d for dependency check" msgstr "" -#: ../lib/depends.c:908 +#: ../lib/depends.c:903 #, c-format msgid "loop in prerequisite chain: %s" msgstr "" @@ -2409,58 +2409,58 @@ msgid "" "only packages with major numbers <= 3 are supported by this version of RPM" msgstr "" -#: ../lib/problems.c:44 +#: ../lib/problems.c:40 #, c-format msgid " is needed by %s-%s-%s\n" msgstr "" -#: ../lib/problems.c:47 +#: ../lib/problems.c:43 #, c-format msgid " conflicts with %s-%s-%s\n" msgstr "" -#: ../lib/problems.c:74 +#: ../lib/problems.c:70 #, c-format msgid "package %s-%s-%s is for a different architecture" msgstr "" -#: ../lib/problems.c:79 +#: ../lib/problems.c:75 #, c-format msgid "package %s-%s-%s is for a different operating system" msgstr "" -#: ../lib/problems.c:84 +#: ../lib/problems.c:80 #, c-format msgid "package %s-%s-%s is already installed" msgstr "" -#: ../lib/problems.c:89 +#: ../lib/problems.c:85 #, c-format msgid "path %s is not relocateable for package %s-%s-%s" msgstr "" -#: ../lib/problems.c:94 +#: ../lib/problems.c:90 #, c-format msgid "file %s conflicts between attemped installs of %s-%s-%s and %s-%s-%s" msgstr "" -#: ../lib/problems.c:100 +#: ../lib/problems.c:96 #, c-format msgid "" "file %s from install of %s-%s-%s conflicts with file from package %s-%s-%s" msgstr "" -#: ../lib/problems.c:106 +#: ../lib/problems.c:102 #, c-format msgid "package %s-%s-%s (which is newer then %s-%s-%s) is already installed" msgstr "" -#: ../lib/problems.c:112 +#: ../lib/problems.c:108 #, c-format msgid "installing package %s-%s-%s needs %ld%c on the %s filesystem" msgstr "" -#: ../lib/problems.c:124 +#: ../lib/problems.c:120 #, c-format msgid "unknown error %d encountered while manipulating package %s-%s-%s" msgstr "" -- 2.7.4