From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 26 Sep 2020 14:17:09 +0000 (+0200)
Subject: - version 1.748: added %_ver_lt, %_ver_ge
X-Git-Tag: auto/th/rpm-pld-macros-1.748-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d77fb7bd17fea72a64b2942ccfa15bb98627de0a;p=packages%2Frpm-pld-macros.git

- version 1.748: added %_ver_lt, %_ver_ge
---

diff --git a/macros.pld b/macros.pld
index e029dc2..3eddc3e 100644
--- a/macros.pld
+++ b/macros.pld
@@ -516,6 +516,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
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index c21a347..88ecec4 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