commit 330b128e276a3d8e99b47349afc4cca92b7a3aae
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 27 20:20:03 2020 +0200
- version 1.749: fixed _ver_* macros
macros.pld | 6 +++---
rpm-pld-macros.spec | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index 1bd76b3..f64c1df 100644
--- 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
diff --git a/macros.pld b/macros.pld
index 17c8322..a458656 100644
--- a/macros.pld
+++ b/macros.pld
@@ -671,9 +671,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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/30647bdfd22924ab2eb101b67422432c831d8520
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
