From 358b385bf77f33180f71498f8a35c8fbc76b9fd7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Sun, 22 Nov 2020 19:58:42 +0100
Subject: [PATCH] - merge macros.in patches

---
 missing-macros.patch |  8 ++++++++
 rpm.spec             |  4 +---
 rpmversion.patch     | 10 ----------
 3 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 rpmversion.patch

diff --git a/missing-macros.patch b/missing-macros.patch
index 5b40254..56a7592 100644
--- 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 b8da992..1b6e3d2 100644
--- 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
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.
-- 
2.43.0