diff --git a/weakdepscompat.diff b/weakdepscompat.diff index d939d95..d7ddb35 100644 --- a/weakdepscompat.diff +++ b/weakdepscompat.diff @@ -1,5 +1,5 @@ ---- ./build/parsePreamble.c.orig 2014-02-20 15:35:51.192797607 +0000 -+++ ./build/parsePreamble.c 2014-02-20 15:36:00.468797591 +0000 +--- ./build/parsePreamble.c.orig 2014-02-20 15:46:48.217796445 +0000 ++++ ./build/parsePreamble.c 2014-02-20 15:46:59.388796425 +0000 @@ -343,6 +343,7 @@ static struct tokenBits_s const installS { "verify", RPMSENSE_SCRIPT_VERIFY }, { "pretrans", RPMSENSE_PRETRANS }, @@ -8,8 +8,8 @@ { NULL, 0 } }; ---- ./build/rpmfc.c.orig 2014-02-20 15:35:51.204797607 +0000 -+++ ./build/rpmfc.c 2014-02-20 15:36:00.468797591 +0000 +--- ./build/rpmfc.c.orig 2014-02-20 15:46:48.230796445 +0000 ++++ ./build/rpmfc.c 2014-02-20 15:46:59.389796425 +0000 @@ -1156,6 +1156,12 @@ static struct DepMsg_s depMsgs[] = { { "Obsoletes", { "%{?__find_obsoletes}", NULL, NULL, NULL }, RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS, @@ -40,8 +40,8 @@ break; default: continue; ---- ./lib/rpmds.c.orig 2014-02-20 15:35:51.126797608 +0000 -+++ ./lib/rpmds.c 2014-02-20 15:35:56.508797598 +0000 +--- ./lib/rpmds.c.orig 2014-02-20 15:46:48.157796445 +0000 ++++ ./lib/rpmds.c 2014-02-20 15:46:59.389796425 +0000 @@ -86,6 +86,14 @@ static int dsType(rpmTagVal tag, t = "Trigger"; evr = RPMTAG_TRIGGERVERSION; @@ -57,8 +57,8 @@ } else { rc = 1; } ---- ./lib/tagexts.c.orig 2014-02-20 15:35:51.131797608 +0000 -+++ ./lib/tagexts.c 2014-02-20 15:36:27.137797544 +0000 +--- ./lib/tagexts.c.orig 2014-02-20 15:46:48.162796445 +0000 ++++ ./lib/tagexts.c 2014-02-20 15:48:04.458796310 +0000 @@ -906,6 +906,35 @@ static int depnevrsTag(Header h, rpmtd t return (ndeps > 0); } @@ -115,14 +115,14 @@ { - return depnevrsTag(h, td, hgflags, RPMTAG_SUPPLEMENTNAME); + return depnevrsTag(h, td, hgflags, RPMTAG_SUPPLEMENTNAME) || -+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESSNAME, RPMSENSE_STRONG); ++ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESNAME, RPMSENSE_STRONG); } static int enhancenevrsTag(Header h, rpmtd td, headerGetFlags hgflags) { - return depnevrsTag(h, td, hgflags, RPMTAG_ENHANCENAME); + return depnevrsTag(h, td, hgflags, RPMTAG_ENHANCENAME) || -+ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESSNAME, 0); ++ depnevrsTagFiltered(h, td, hgflags, RPMTAG_OLDENHANCESNAME, 0); } static int providenevrsTag(Header h, rpmtd td, headerGetFlags hgflags)