SOURCES: rpm.macros - minify

glen glen at pld-linux.org
Wed Feb 11 21:02:53 CET 2009


Author: glen                         Date: Wed Feb 11 20:02:53 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- minify

---- Files affected:
SOURCES:
   rpm.macros (1.504 -> 1.505) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.504 SOURCES/rpm.macros:1.505
--- SOURCES/rpm.macros:1.504	Wed Feb 11 20:46:19 2009
+++ SOURCES/rpm.macros	Wed Feb 11 21:02:47 2009
@@ -326,7 +326,7 @@
 # Requires: name = version
 %requires_eq()		%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to %1 %1}}}
 # Requires: name = version (version based on querying package %2)
-%requires_eq_to(r)	%{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(Z=$(LC_ALL=C rpm -q --qf 'Requires: %1 = %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2); if ! echo "$Z" | grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
+%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)}}
 
 %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
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.504&r2=1.505&f=u



More information about the pld-cvs-commit mailing list