- merge macros.in patches

diff --git a/missing-macros.patch b/missing-macros.patch
index 5b402549096bbcb8ed71f3ec2a667966ddc4dd5e..56a75924146af4c76df0e7f890da3279e5a5d023 100644 (file)
--- a/missing-macros.patch
+++ b/missing-macros.patch
@@ -18,6 +18,14 @@
  AC_PATH_PROG(__XZ, xz, /usr/bin/xz, $MYPATH)
 --- rpm-4.16.0/macros.in~      2020-11-21 19:41:19.000000000 +0100
 +++ rpm-4.16.0/macros.in       2020-11-22 19:45:24.182620411 +0100
+@@ -6,6 +6,7 @@
+ # should be added to /etc/rpm/macros, while per-user configuration should
+ # be added to ~/.rpmmacros.
+ #
++%_rpmversion          @VERSION@
+ 
+ #==============================================================================
+ # ---- A macro that expands to nothing.
 @@ -25,6 +25,7 @@
  #
  %__7zip                       @__7ZIP@

diff --git a/rpm.spec b/rpm.spec
index b8da99289c5b962632fbc9f04b9c7e43b6deabfe..1b6e3d2a270abc95dc9603285e2328551dafe672 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -68,7 +68,7 @@ Patch14:      %{name}-ignore-missing-macro-files.patch
 Patch15:       x32.patch
 Patch16:       rpm5-db-compat.patch
 Patch17:       python-internal-build.patch
-Patch18:       rpmversion.patch
+Patch18:       missing-macros.patch
 Patch19:       pkgconfig.patch
 Patch20:       uname-deps.patch
 Patch21:       aarch64.patch
@@ -78,7 +78,6 @@ Patch24:      cpuinfo-deps.patch
 Patch25:       rpmio-read-proc-files.patch
 Patch26:       allow-at-in-ver-rel.patch
 Patch27:       no-exeonly-for-elf-reqprov.patch
-Patch28:       missing-macros.patch
 URL:           https://rpm.org/
 BuildRequires: acl-devel
 BuildRequires: db-devel >= %{db_ver}
@@ -572,7 +571,6 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
 
 install %{SOURCE15} scripts/perl.prov.in
 

diff --git a/rpmversion.patch b/rpmversion.patch
deleted file mode 100644 (file)
index 1dd7d49..0000000
--- a/rpmversion.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpm-4.16.0/macros.in~      2020-09-30 09:48:01.000000000 +0200
-+++ rpm-4.16.0/macros.in       2020-10-18 17:23:24.762186901 +0200
-@@ -6,6 +6,7 @@
- # should be added to /etc/rpm/macros, while per-user configuration should
- # be added to ~/.rpmmacros.
- #
-+%_rpmversion          @VERSION@
- 
- #==============================================================================
- # ---- A macro that expands to nothing.