From a04002a841905f8c84ca1c955e047676994c1ef2 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 27 Sep 2020 20:20:03 +0200 Subject: [PATCH] - version 1.749: fixed _ver_* macros --- macros.pld | 6 +++--- rpm-pld-macros.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/macros.pld b/macros.pld index 3eddc3e..8c3f698 100644 --- 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 88ecec4..1d8f705 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 -- 2.44.0