Author: glen Date: Thu Jan 28 15:14:00 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.531: add -n to %requires_releq_kernel* too
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.228 -> 1.229) , rpm.macros (1.530 -> 1.531)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.228
packages/rpm-build-macros/rpm-build-macros.spec:1.229
--- packages/rpm-build-macros/rpm-build-macros.spec:1.228 Thu Jan 28
16:06:06 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec Thu Jan 28 16:13:54 2010
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.530
+%define rpm_macros_rev 1.531
%define find_lang_rev 1.32
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
@@ -90,6 +90,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.229 2010/01/28 15:13:54 glen
+- 1.531: add -n to %requires_releq_kernel* too
+
Revision 1.228 2010/01/28 15:06:06 glen
- 1.530: add -n SUBPKG supprot to %releq_kernel* macros
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.530
packages/rpm-build-macros/rpm.macros:1.531
--- packages/rpm-build-macros/rpm.macros:1.530 Thu Jan 28 16:05:50 2010
+++ packages/rpm-build-macros/rpm.macros Thu Jan 28 16:13:54 2010
@@ -367,9 +367,9 @@
%releq_kernel_smp(n:) %{expand:%%global releq_kernel_smp %(R=$(LC_ALL=C rpm
-q --qf '%{N}%{?-n:-%{-n*}}-smp = %|E?{%{E}:}|%{V}-%{R}' -f
%{_kernelsrcdir}/include/linux/version.h 2>/dev/null | grep -v 'is not' | sed
-e 's:-headers::;s:-config::'); echo ${R:-ERROR})}%releq_kernel_smp
# -s post to generate Requires(post) dependency
-%requires_releq_kernel(s:) Requires%{-s:(%{-s*})}: %releq_kernel
-%requires_releq_kernel_up(s:) Requires%{-s:(%{-s*})}: %releq_kernel_up
-%requires_releq_kernel_smp(s:) Requires%{-s:(%{-s*})}: %releq_kernel_smp
+%requires_releq_kernel(s:n:) Requires%{-s:(%{-s*})}: %releq_kernel
+%requires_releq_kernel_up(s:n:) Requires%{-s:(%{-s*})}:
%releq_kernel_up
+%requires_releq_kernel_smp(s:n:) Requires%{-s:(%{-s*})}:
%releq_kernel_smp
# Requires name = version-release
%requires_releq()
%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.228&r2=1.229&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.530&r2=1.531&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
