diff --git a/0001-add-dist-to-release-by-default.patch b/0001-add-dist-to-release-by-default.patch new file mode 100644 index 0000000..9640c15 --- /dev/null +++ b/0001-add-dist-to-release-by-default.patch @@ -0,0 +1,37 @@ +From af9a2347cd725a8dbb6045d7d3e9661d524af110 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Wed, 4 Mar 2020 16:12:58 +0800 +Subject: [PATCH] add dist to release by default + +--- + build/parsePreamble.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/build/parsePreamble.c b/build/parsePreamble.c +index b0a17c8..cac899a 100644 +--- a/build/parsePreamble.c ++++ b/build/parsePreamble.c +@@ -808,6 +808,11 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, + case RPMTAG_VERSION: + case RPMTAG_RELEASE: + SINGLE_TOKEN_ONLY; ++ if (tag == RPMTAG_RELEASE) { ++ char *dist = rpmExpand("%{?dist}",NULL); ++ rasprintf(&field,"%s%s",field,dist); ++ free(dist); ++ } + if (rpmCharCheck(spec, field, WHITELIST_VERREL)) + goto exit; + headerPutString(pkg->header, tag, field); +@@ -987,6 +992,8 @@ static rpmRC handlePreambleTag(rpmSpec spec, Package pkg, rpmTagVal tag, + } + rc = RPMRC_OK; + exit: ++ if (tag == RPMTAG_RELEASE) ++ free(field); + return rc; + } + +-- +1.8.3.1 + diff --git a/rpm.spec b/rpm.spec index 7034a59..54846ea 100644 --- a/rpm.spec +++ b/rpm.spec @@ -1,6 +1,6 @@ Name: rpm Version: 4.15.1 -Release: 10 +Release: 11 Summary: RPM Package Manager License: GPLv2+ URL: http://www.rpm.org/ @@ -10,6 +10,7 @@ Patch1: 0001-Unbundle-config-site-and-add-RPM-LD-FLAGS-macro.patch Patch2: rpm-4.12.0-rpm2cpio-hack.patch Patch3: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch Patch4: 0001-skip-updating-the-preferences.patch +Patch5: 0001-add-dist-to-release-by-default.patch Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch Patch9001: 0001-bugfix-rpm-4.14.2-fix-tty-failed.patch @@ -280,6 +281,12 @@ make check || (cat tests/rpmtests.log; exit 0) %{_mandir}/man1/gendiff.1* %changelog +* Wed Mar 4 2020 openEuler Buildteam - 4.15.1-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add dist to release by default + * Mon Mar 2 2020 openEuler Buildteam - 4.15.1-10 - Type:bugfix - ID:NA