Author: sparky Date: Mon Nov 13 15:51:42 2006 GMT Module: SPECS Tag: LINUX_2_6_16 ---- Log message: - don't use %{without ...}, it may not work after inverting bcond
---- Files affected: SPECS: kernel.spec (1.441.2.1558.2.41 -> 1.441.2.1558.2.42) ---- Diffs: ================================================================ Index: SPECS/kernel.spec diff -u SPECS/kernel.spec:1.441.2.1558.2.41 SPECS/kernel.spec:1.441.2.1558.2.42 --- SPECS/kernel.spec:1.441.2.1558.2.41 Sun Nov 12 22:57:03 2006 +++ SPECS/kernel.spec Mon Nov 13 16:51:37 2006 @@ -30,7 +30,7 @@ %{?debug:%define with_verbose 1} -%if %{without grsecurity} +%if !%{with grsecurity} %undefine with_grsec_full %undefine with_grsec_minimal %undefine with_pax @@ -1234,7 +1234,7 @@ %depmod %{version}-%{release}%{xen} -%if %{without xenU} +%if !%{with xenU} /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{version}-%{release}%{xen}.gz %{version}-%{release}%{xen} mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2> /dev/null > /dev/null ln -sf initrd-%{version}-%{release}%{xen}.gz %{initrd_dir}/initrd%{dashxen} @@ -1308,7 +1308,7 @@ %depmod %{version}-%{release}%{xen}smp -%if %{without xenU} +%if !%{with xenU} /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{version}-%{release}%{xen}smp.gz %{version}-%{release}%{xen}smp mv -f %{initrd_dir}/initrd%{dashxen} %{initrd_dir}/initrd%{dashxen}.old 2> /dev/null > /dev/null ln -sf initrd-%{version}-%{release}%{xen}smp.gz %{initrd_dir}/initrd%{dashxen} @@ -1398,7 +1398,7 @@ %if %{have_drm} %exclude /lib/modules/%{version}-%{release}%{xen}/kernel/drivers/char/drm %endif -%if %{have_oss} && %{have_isa} && %{without xen0} && %{without xenU} +%if %{have_oss} && %{have_isa} && !%{with xen0} && !%{with xenU} %exclude /lib/modules/%{version}-%{release}%{xen}/kernel/drivers/media/radio/miropcm20.ko* %endif /lib/modules/%{version}-%{release}%{xen}/kernel/fs @@ -1487,7 +1487,7 @@ %files sound-oss %defattr(644,root,root,755) /lib/modules/%{version}-%{release}%{xen}/kernel/sound/oss -%if %{have_isa} && %{without xen0} && %{without xenU} +%if %{have_isa} && !%{with xen0} && !%{with xenU} /lib/modules/%{version}-%{release}%{xen}/kernel/drivers/media/radio/miropcm20.ko* %endif %endif @@ -1514,7 +1514,7 @@ %if %{have_drm} %exclude /lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/char/drm %endif -%if %{have_oss} && %{have_isa} && %{without xen0} && %{without xenU} +%if %{have_oss} && %{have_isa} && !%{with xen0} && !%{with xenU} %exclude /lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/media/radio/miropcm20.ko* %endif /lib/modules/%{version}-%{release}%{xen}smp/kernel/fs @@ -1603,7 +1603,7 @@ %files smp-sound-oss %defattr(644,root,root,755) /lib/modules/%{version}-%{release}%{xen}smp/kernel/sound/oss -%if %{have_isa} && %{without xen0} && %{without xenU} +%if %{have_isa} && !%{with xen0} && !%{with xenU} /lib/modules/%{version}-%{release}%{xen}smp/kernel/drivers/media/radio/miropcm20.ko* %endif %endif @@ -1689,6 +1689,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.441.2.1558.2.42 2006/11/13 15:51:37 sparky +- don't use %{without ...}, it may not work after inverting bcond + Revision 1.441.2.1558.2.41 2006/11/12 21:57:03 adamg - CVE notes for 2.6.16.31 - changelog cosmetics ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1558.2.41&r2=1.441.2.1558.2.42&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit