[packages/rpm-pld-macros/rpm.org] - version 1.748: added %_ver_lt, %_ver_ge

baggins baggins at pld-linux.org
Sun Oct 4 17:33:05 CEST 2020


commit bd4569b75618f1f102090b72612d9f07a40fe5f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 26 16:17:09 2020 +0200

    - version 1.748: added %_ver_lt, %_ver_ge

 macros.pld          | 5 +++++
 rpm-pld-macros.spec | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 0278250..1bd76b3 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.747
+%define		rpm_macros_rev	1.748
 %define		find_lang_rev	1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.pld b/macros.pld
index f9f4006..17c8322 100644
--- a/macros.pld
+++ b/macros.pld
@@ -670,6 +670,11 @@ LC_ALL=C.UTF-8 %{__meson} \
 Obsoletes: %{1} < %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}} \
 Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}
 
+# for package versions comparison (incl. cc_version or _rpmversion)
+# BuildRequires:	rpmbuild(macros) >= 1.748
+%_ver_lt()	%(test rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1 -eq 2; echo $?)
+%_ver_ge()	!%(test rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1 -eq 2; echo $?)
+
 %apache_modules_api %{expand:%%global apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)}%apache_modules_api
 
 # sgml macros
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/30647bdfd22924ab2eb101b67422432c831d8520



More information about the pld-cvs-commit mailing list