- version 1.748: added %_ver_lt, %_ver_ge

diff --git a/macros.pld b/macros.pld
index e029dc266ca6a63abc9e4c73b2093d6583797021..3eddc3ecfb743efc09d4cf5f0a50649c41f0f068 100644 (file)
--- 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 c21a3475408d3ccc0d94c25b36f5bb585e478c18..88ecec4ed466a3a953e85d154aba47badaebb623 100644 (file)
--- 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