Hello community, here is the log from the commit of package rpm for openSUSE:Factory checked in at 2019-05-03 22:06:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpm (Old) and /work/SRC/openSUSE:Factory/.rpm.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpm" Fri May 3 22:06:27 2019 rev:271 rq:697576 version:4.14.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/rpm/rpm.changes 2019-02-14 14:10:43.220300261 +0100 +++ /work/SRC/openSUSE:Factory/.rpm.new.5148/rpm.changes 2019-05-03 22:06:29.910811904 +0200 @@ -1,0 +2,7 @@ +Tue Apr 16 08:40:11 UTC 2019 - Stasiek Michalski <hellcp@mailbox.org> + +- backport "push name/epoch/version/release macro before invoking depgens" + change for correct generation of dependencies by other dep generators + * new patch: rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch + +------------------------------------------------------------------- New: ---- rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.YwkPZJ/_old 2019-05-03 22:06:33.430818151 +0200 +++ /var/tmp/diff_new_pack.YwkPZJ/_new 2019-05-03 22:06:33.434818158 +0200 @@ -128,6 +128,7 @@ Patch117: findsupplements.diff Patch118: dwz-compression.patch Patch119: getncpus.diff +Patch120: rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch Patch6464: auto-config-update-aarch64-ppc64le.diff Patch6465: auto-config-update-riscv64.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -226,7 +227,7 @@ %patch -P 93 -P 94 -P 99 %patch -P 100 -P 102 -P 103 -P 108 %patch -P 109 -P 114 -P 117 -P 118 -%patch -P 119 +%patch -P 119 -P 120 %ifarch aarch64 ppc64le riscv64 %patch6464 ++++++ rpmfc-push-name-epoch-version-release-macro-before-invoking-depgens.patch ++++++

From 0d2176c9a3ae44fd0a67c9983b1a5ba0a00388fd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko <i.gnatenko.brain@gmail.com> Date: Mon, 15 Oct 2018 19:49:57 +0200 Subject: [PATCH] rpmfc: push name/epoch/version/release macro before invoking depgens

Fixes: https://github.com/rpm-software-management/rpm/issues/502 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com> --- build/rpmfc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git build/rpmfc.c build/rpmfc.c index 2fbfc69ab..eccd6582a 100644 --- build/rpmfc.c +++ build/rpmfc.c @@ -1334,9 +1334,31 @@ static rpmRC rpmfcApplyExternal(rpmfc fc) return rc; } +typedef const struct macroExport_s { + const char * name; + rpmTagVal tag; +} * macroExport; + +static struct macroExport_s const macroExportList[] = { + { "name", RPMTAG_NAME }, + { "epoch", RPMTAG_EPOCH }, + { "version", RPMTAG_VERSION }, + { "release", RPMTAG_RELEASE }, + { NULL, 0 } +}; + rpmRC rpmfcApply(rpmfc fc) { rpmRC rc; + Package pkg = fc->pkg; + macroExport me; + for (me = macroExportList; me->name; me++) { + char *val = headerGetAsString(pkg->header, me->tag); + if (val) { + rpmPushMacro(NULL, me->name, NULL, val, RMIL_SPEC); + free(val); + } + } /* If new-fangled dependency generation is disabled ... */ if (!rpmExpandNumeric("%{?_use_internal_dependency_generator}")) { /* ... then generate dependencies using %{__find_requires} et al. */ @@ -1347,6 +1369,9 @@ rpmRC rpmfcApply(rpmfc fc) /* ... otherwise generate per-file dependencies */ rc = rpmfcApplyInternal(fc); } + for (me = macroExportList; me->name; me++) + if (headerIsEntry(pkg->header, me->tag)) + rpmPopMacro(NULL, me->name); return rc; }