diff --git a/checksepwarn.diff b/checksepwarn.diff new file mode 100644 index 0000000..abf4480 --- /dev/null +++ b/checksepwarn.diff @@ -0,0 +1,19 @@ +--- ./build/parseReqs.c.orig 2014-02-21 12:25:51.259664860 +0000 ++++ ./build/parseReqs.c 2014-02-21 12:28:07.545664619 +0000 +@@ -178,8 +178,14 @@ rpmRC parseRCPOT(rpmSpec spec, Package p + if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit; + + /* While ':' and '-' are valid, only one of each is valid. */ +- if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg)) +- goto exit; ++ if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg)) { ++ if (tagflags & (RPMSENSE_FIND_REQUIRES|RPMSENSE_FIND_PROVIDES)) { ++ rpmlog(RPMLOG_WARNING, "%s: %s\n", emsg, r); ++ } else { ++ rpmlog(RPMLOG_WARNING, _("line %d: %s: %s\n"), spec->lineNum, emsg, spec->line); ++ } ++ emesg = _free(emsg); ++ } + + re = ve; /* ==> next token after EVR string starts here */ + } else diff --git a/rpm.changes b/rpm.changes index e279326..d8ba0a0 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 13:33:48 CET 2014 - mls@suse.de + +- make the 'douple separator' error a warning + new patch: checksepwarn.diff + ------------------------------------------------------------------- Thu Feb 20 16:24:24 CET 2014 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index b80037d..2b047c3 100644 --- a/rpm.spec +++ b/rpm.spec @@ -135,6 +135,7 @@ Patch82: noposttrans.diff Patch85: brp-compress-no-img.patch Patch92: find-lang-python.patch Patch93: weakdepscompat.diff +Patch94: checksepwarn.diff Patch6464: auto-config-update-aarch64-ppc64le.diff Patch68000: m68k.patch Patch68001: debugedit-m68k.patch @@ -224,7 +225,7 @@ rm -f rpmdb/db.h %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79 %patch -P 80 -P 82 -P 85 -%patch -P 92 -P 93 +%patch -P 92 -P 93 -P 94 %ifarch aarch64 ppc64le %patch6464