[packages/rpm/rpm.org] - define _rpmversion macro for compatibility with rpm5
baggins
baggins at pld-linux.org
Sun Oct 18 17:26:10 CEST 2020
commit 5570f8e668058ff05a43ed59043d0b1aa9ce88df
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Oct 18 17:25:37 2020 +0200
- define _rpmversion macro for compatibility with rpm5
rpm.spec | 2 ++
rpmversion.patch | 10 ++++++++++
2 files changed, 12 insertions(+)
---
diff --git a/rpm.spec b/rpm.spec
index 4078ba5..35e2370 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -68,6 +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
URL: https://rpm.org/
BuildRequires: db-devel >= %{db_ver}
BuildRequires: autoconf >= 2.63
@@ -551,6 +552,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
install %{SOURCE15} scripts/perl.prov.in
diff --git a/rpmversion.patch b/rpmversion.patch
new file mode 100644
index 0000000..1dd7d49
--- /dev/null
+++ b/rpmversion.patch
@@ -0,0 +1,10 @@
+--- 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.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/5570f8e668058ff05a43ed59043d0b1aa9ce88df
More information about the pld-cvs-commit
mailing list