diff --git a/rpm-4.11.2-double-separator-warning.patch b/rpm-4.11.2-double-separator-warning.patch new file mode 100644 index 0000000..23cdfa3 --- /dev/null +++ b/rpm-4.11.2-double-separator-warning.patch @@ -0,0 +1,17 @@ +diff -up rpm-4.11.2/build/parseReqs.c.double-sep-warning rpm-4.11.2/build/parseReqs.c +--- rpm-4.11.2/build/parseReqs.c.double-sep-warning 2014-02-18 08:59:32.692891895 +0200 ++++ rpm-4.11.2/build/parseReqs.c 2014-02-18 09:00:17.572769945 +0200 +@@ -166,8 +166,11 @@ 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)) { ++ rpmlog(RPMLOG_WARNING, _("line %d: %s: %s\n"), ++ spec->lineNum, emsg, spec->line); ++ emsg = _free(emsg); ++ } + + re = ve; /* ==> next token after EVR string starts here */ + } else diff --git a/rpm.spec b/rpm.spec index abbe18d..7f5cb78 100644 --- a/rpm.spec +++ b/rpm.spec @@ -21,7 +21,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}1%{?dist} +Release: %{?snapver:0.%{snapver}.}2%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2 @@ -43,6 +43,10 @@ Patch5: rpm-4.9.90-armhfp.patch #conditionally applied patch for arm hardware floating point Patch6: rpm-4.9.0-armhfp-logic.patch +# Fedora has big package stacks based on broken dependency EVRs, reduce the +# double separator error into an error on released versions (#1065563) +Patch10: rpm-4.11.2-double-separator-warning.patch + # Patches already in upstream # These are not yet upstream @@ -222,6 +226,8 @@ packages on a system. %patch3 -p1 -b .no-man-dirs %patch4 -p1 -b .use-gpg2 +%patch10 -p1 -b .double-sep-warning + %patch301 -p1 -b .niagara %patch302 -p1 -b .geode %patch304 -p1 -b .ldflags @@ -458,6 +464,9 @@ exit 0 %doc COPYING doc/librpm/html/* %changelog +* Tue Feb 18 2014 Panu Matilainen - 4.11.2-2 +- reduce the double separator spec parse error into a warning (#1065563) + * Thu Feb 13 2014 Panu Matilainen - 4.11.2-1 - update to 4.11.2 (http://rpm.org/wiki/Releases/4.11.2)