modify dist of src.rpm

add-dist-to-the-name-of-package.patch

@@ -1,50 +0,0 @@
-From 10261618da16162c89e770d2c708c665702781d3 Mon Sep 17 00:00:00 2001
-From: openEuler Buildteam <buildteam@openeuler.org>
-Date: Thu, 27 Feb 2020 02:10:17 -0500
-Subject: [PATCH] add dist to the name of package
-
----
- build/files.c | 2 +-
- macros.in     | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/build/files.c b/build/files.c
-index 6dfd801..5a64100 100644
---- a/build/files.c
-+++ b/build/files.c
-@@ -2637,7 +2637,7 @@ static void genSourceRpmName(rpmSpec spec)
- {
-     if (spec->sourceRpmName == NULL) {
- 	char *nvr = headerGetAsString(spec->packages->header, RPMTAG_NVR);
--	rasprintf(&spec->sourceRpmName, "%s.%ssrc.rpm", nvr,
-+	rasprintf(&spec->sourceRpmName, "%s%{_dist}.%ssrc.rpm", nvr,
- 	    	  spec->noSource ? "no" : "");
- 	free(nvr);
-     }
-diff --git a/macros.in b/macros.in
-index fe9803a..adeaa2a 100644
---- a/macros.in
-+++ b/macros.in
-@@ -80,6 +80,10 @@
- %__remsh		%{__rsh}
- %__strip		@__STRIP@
- 
-+#==============================================================================
-+# Distribution
-+%_dist                  %{?dist:%{dist}}%{!?dist:%{nil}}
-+
- #==============================================================================
- # Conditional build stuff.
- 
-@@ -697,7 +701,7 @@ package or when debugging this package.\
- #	binary packages.
- #
- # XXX	Note: escaped %% for use in headerSprintf()
--%_build_name_fmt	%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
-+%_build_name_fmt	%%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}%{_dist}.%%{ARCH}.rpm
- 
- #	Verify digest/signature flags for various rpm modes:
- #	0x30300 (RPMVSF_MASK_NODIGESTS)    --nohdrchk      if set, don't check digest(s)
--- 
-2.19.1
-

rpm.spec

@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.15.1
-Release:       9
+Release:       10
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -10,7 +10,6 @@ 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: add-dist-to-the-name-of-package.patch
 
 Patch9000: bugfix-rpm-4.11.3-add-aarch64_ilp32-arch.patch
 Patch9001: 0001-bugfix-rpm-4.14.2-fix-tty-failed.patch
@@ -281,6 +280,12 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Mon Mar 2 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-10
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:revert last commit
+
 * Thu Feb 27 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.15.1-9
 - Type:bugfix
 - ID:NA