- version 1.749: fixed _ver_* macros

diff --git a/macros.pld b/macros.pld
index 3eddc3ecfb743efc09d4cf5f0a50649c41f0f068..8c3f698459f54d463658453205c4560e4e936bd6 100644 (file)
--- a/macros.pld
+++ b/macros.pld
@@ -517,9 +517,9 @@ 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 $?)
+# BuildRequires:       rpmbuild(macros) >= 1.749
+%_ver_lt()     %(test $(rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1; echo $?) -eq 2; echo $?)
+%_ver_ge()     %(test $(rpmvercmp "%{1}" "%{2}" >/dev/null 2>&1; echo $?) -ne 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
 

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 88ecec4ed466a3a953e85d154aba47badaebb623..1d8f705c8775afb802f6c9b05a98583d112fd1d4 100644 (file)
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.748
+%define                rpm_macros_rev  1.749
 %define                find_lang_rev   1.40
 # split into individual X_prov_ver if there is a reason to desync
 %define                prov_ver        4.15