packages: rpm-build-macros/rpm.macros - requires_ge and requres_ge_to, base...

[baggins]

Author: baggins                      Date: Thu Apr 29 12:52:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- requires_ge and requres_ge_to, based on requires_eq* macros

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.558 -> 1.559) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.558 packages/rpm-build-macros/rpm.macros:1.559
--- packages/rpm-build-macros/rpm.macros:1.558	Tue Apr 27 10:38:09 2010
+++ packages/rpm-build-macros/rpm.macros	Thu Apr 29 14:52:00 2010
@@ -426,6 +426,11 @@
 # Requires: name = version (version based on querying package %2)
 %requires_eq_to(r)	%{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm -q --qf 'Requires: %1 = %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
 
+# Requires: name >= version
+%requires_ge()		%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_ge_to %1 %1}}}
+# Requires: name >= version (version based on querying package %2)
+%requires_ge_to(r)	%{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm -q --qf 'Requires: %1 >= %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
+
 %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
 
 # kernel version-release handling
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.558&r2=1.559&f=u