SOURCES: rpm.macros - moved requires_eq() macro back to build-macros

glen glen at pld-linux.org
Tue Jan 17 20:00:36 CET 2006


Author: glen                         Date: Tue Jan 17 19:00:35 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- moved requires_eq() macro back to build-macros

---- Files affected:
SOURCES:
   rpm.macros (1.280 -> 1.281) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.280 SOURCES/rpm.macros:1.281
--- SOURCES/rpm.macros:1.280	Wed Jan 11 23:42:27 2006
+++ SOURCES/rpm.macros	Tue Jan 17 20:00:30 2006
@@ -193,6 +193,7 @@
 %requires_releq_kernel_up()  	%(LC_ALL="C" rpm -qf --qf 'PreReq: %%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
 %requires_releq_kernel_smp()  	%(LC_ALL="C" rpm -qf --qf 'PreReq: %%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
 
+%requires_eq()		%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not")
 
 %apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.280&r2=1.281&f=u



More information about the pld-cvs-commit mailing list