Author: arekm Date: Sat Aug 8 14:03:36 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- use %%unglobal macro (define/undefine work as push/pop on the stack; unglobal
does pop all values from the stack)
---- Files affected:
packages/kernel:
kernel.spec (1.690 -> 1.691)
---- Diffs:
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.690 packages/kernel/kernel.spec:1.691
--- packages/kernel/kernel.spec:1.690 Thu Aug 6 13:25:30 2009
+++ packages/kernel/kernel.spec Sat Aug 8 16:03:30 2009
@@ -55,26 +55,26 @@
%{?debug:%define with_verbose 1}
%if %{without grsecurity}
-%undefine with_grsec_full
-%undefine with_grsec_minimal
-%undefine with_pax
+%unglobal with_grsec_full
+%unglobal with_grsec_minimal
+%unglobal with_pax
%endif
%if %{with pax}
-%undefine with_grsec_minimal
+%unglobal with_grsec_minimal
%define with_grsec_full 1
%define with_grsecurity 1
%define with_pax 1
%endif
%if %{with grsec_minimal}
-%undefine with_pax
-%undefine with_grsec_full
+%unglobal with_pax
+%unglobal with_grsec_full
%define with_grsecurity 1
%endif
%if %{with grsec_full}
-%undefine with_grsec_minimal
+%unglobal with_grsec_minimal
%define with_grsecurity 1
%endif
@@ -84,13 +84,13 @@
%define have_pcmcia 1
%if %{with rescuecd}
-%undefine with_apparmor
-%undefine with_tuxonice
-%undefine with_grsecurity
-%undefine with_grsec_full
-%undefine with_grsec_minimal
-%undefine with_pax
-%undefine with_vserver
+%unglobal with_apparmor
+%unglobal with_tuxonice
+%unglobal with_grsecurity
+%unglobal with_grsec_full
+%unglobal with_grsec_minimal
+%unglobal with_pax
+%unglobal with_vserver
%define have_drm 0
%define have_sound 0
%endif
@@ -103,7 +103,7 @@
%endif
%ifarch sparc sparc64
-%undefine with_pcmcia
+%unglobal with_pcmcia
%define have_drm 0
%define have_oss 0
%endif
@@ -350,7 +350,7 @@
# for hostname command
BuildRequires: net-tools
BuildRequires: perl-base
-BuildRequires: rpm-build >= 4.4.9-56
+BuildRequires: rpm-build >= 4.5-24
BuildRequires: rpmbuild(macros) >= 1.217
Requires(post): coreutils
Requires(post): geninitrd >= 10000-3
@@ -1576,6 +1576,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.691 2009/08/08 14:03:30 arekm
+- use %%unglobal macro (define/undefine work as push/pop on the stack;
unglobal does pop all values from the stack)
+
Revision 1.690 2009/08/06 11:25:30 mguevara
- 2.6.30.4-0.3; changed bcond pax_full -> pax; removed patches 9997
kernel-pax_selinux_hooks.patch and 9998 kernel-pax.patch; more cleanup
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.690&r2=1.691&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
