Author: glen Date: Sun Mar 12 14:04:15 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- fixed %releq_kernel macros
---- Files affected:
SOURCES:
rpm.macros (1.287 -> 1.288)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.287 SOURCES/rpm.macros:1.288
--- SOURCES/rpm.macros:1.287 Sun Mar 5 09:56:59 2006
+++ SOURCES/rpm.macros Sun Mar 12 15:04:10 2006
@@ -188,8 +188,8 @@
# Requires name = version-release
%requires_releq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf
'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/
(none):/ /' | grep -v "is not")
-%releq_kernel_up() %(LC_ALL="C" rpm -qf --qf '%%{name}-up =
%%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h
2>/dev/null || echo ERROR | sed -e 's/ (none):/ /' | sed -e 's:-headers::' |
grep -vE "(is not|no such)")
-%releq_kernel_smp() %(LC_ALL="C" rpm -qf --qf '%%{name}-smp =
%%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h
2>/dev/null || echo ERROR | sed -e 's/ (none):/ /' | sed -e 's:-headers::' |
grep -vE "(is not|no such)")
+%releq_kernel_up() %((LC_ALL="C" rpm -qf --qf '%%{name}-up =
%%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h
2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' |
grep -vE "(is not|no such)")
+%releq_kernel_smp() %((LC_ALL="C" rpm -qf --qf '%%{name}-smp =
%%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h
2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' |
grep -vE "(is not|no such)")
%requires_releq_kernel_up(s:) Requires%{-s:(%{-s*})}: %releq_kernel_up
%requires_releq_kernel_smp(s:) Requires%{-s:(%{-s*})}:
%releq_kernel_smp
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.287&r2=1.288&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
