SPECS (AC-branch): X11-driver-firegl.spec, X11-driver-nvidia-legac...

glen glen at pld-linux.org
Mon Oct 22 22:25:08 CEST 2007


Author: glen                         Date: Mon Oct 22 20:25:08 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- unify kernel macros

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.141.2.12 -> 1.141.2.13) , X11-driver-nvidia-legacy.spec (1.38.2.16 -> 1.38.2.17) , X11-driver-nvidia-legacy2.spec (1.1.2.20 -> 1.1.2.21) , X11-driver-nvidia.spec (1.78.2.9.2.19 -> 1.78.2.9.2.20) , drbd.spec (1.90.4.13 -> 1.90.4.14) , eagle-usb.spec (1.89.2.11 -> 1.89.2.12) , em8300.spec (1.49.2.13 -> 1.49.2.14) , ipp2p.spec (1.52.2.12 -> 1.52.2.13) , libfuse.spec (1.76.2.13 -> 1.76.2.14) , ndiswrapper.spec (1.37.2.18 -> 1.37.2.19) , p2p.spec (1.23.2.14 -> 1.23.2.15) , qemu.spec (1.85.2.17 -> 1.85.2.18) , rt2400.spec (1.48.2.11 -> 1.48.2.12) , shfs.spec (1.66.2.11 -> 1.66.2.12) , submount.spec (1.22.2.11 -> 1.22.2.12) , svgalib.spec (1.165.2.11 -> 1.165.2.12) , unionfs.spec (1.24.2.16 -> 1.24.2.17) , zaptel.spec (1.75.2.23 -> 1.75.2.24) , zd1211.spec (1.28.4.13 -> 1.28.4.14) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.12 SPECS/X11-driver-firegl.spec:1.141.2.13
--- SPECS/X11-driver-firegl.spec:1.141.2.12	Mon Oct 15 10:26:44 2007
+++ SPECS/X11-driver-firegl.spec	Mon Oct 22 22:24:59 2007
@@ -10,14 +10,14 @@
 %bcond_without	incall		# include all sources in srpm
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if !%{with kernel}
-%undefine with_dist_kernel
-%endif
-#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
 #
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+#
 %define		_min_eq_x11	1:6.9.0
 %define		_max_x11	1:7.0.0
 %define		x11ver		x690
@@ -255,6 +255,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141.2.13  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.141.2.12  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/X11-driver-nvidia-legacy.spec
diff -u SPECS/X11-driver-nvidia-legacy.spec:1.38.2.16 SPECS/X11-driver-nvidia-legacy.spec:1.38.2.17
--- SPECS/X11-driver-nvidia-legacy.spec:1.38.2.16	Sat Oct 20 13:53:56 2007
+++ SPECS/X11-driver-nvidia-legacy.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,10 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -36,9 +40,11 @@
 Patch1:		%{name}-GL.patch
 Patch2:		%{name}-verbose.patch
 URL:		http://www.nvidia.com/object/unix.html
+%if %{with kernel}
 BuildRequires:	%{kgcc_package}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.330
+%endif
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
@@ -322,6 +328,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38.2.17  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.38.2.16  2007/10/20 11:53:56  hawk
 - updated URL
 

================================================================
Index: SPECS/X11-driver-nvidia-legacy2.spec
diff -u SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.20 SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.21
--- SPECS/X11-driver-nvidia-legacy2.spec:1.1.2.20	Mon Oct 22 21:48:29 2007
+++ SPECS/X11-driver-nvidia-legacy2.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,10 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -35,9 +39,9 @@
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-%endif
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.330
+%endif
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
@@ -318,6 +322,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.21  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.1.2.20  2007/10/22 19:48:29  glen
 - allow build without up kernel
 

================================================================
Index: SPECS/X11-driver-nvidia.spec
diff -u SPECS/X11-driver-nvidia.spec:1.78.2.9.2.19 SPECS/X11-driver-nvidia.spec:1.78.2.9.2.20
--- SPECS/X11-driver-nvidia.spec:1.78.2.9.2.19	Mon Oct 22 10:51:47 2007
+++ SPECS/X11-driver-nvidia.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,10 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -16,7 +20,6 @@
 %define		_nv_ver		100.14.19
 %define		_min_x11	6.7.0
 %define		_rel	55
-#
 
 Summary:	Linux Drivers for NVIDIA GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych NVIDIA GeForce/Quadro
@@ -35,9 +38,9 @@
 URL:		http://www.nvidia.com/object/unix.html
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
-%endif
 BuildRequires:	%{kgcc_package}
 BuildRequires:	rpmbuild(macros) >= 1.330
+%endif
 BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	X11-Xserver
@@ -322,6 +325,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78.2.9.2.20  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.78.2.9.2.19  2007/10/22 08:51:47  glen
 - allow building without up
 

================================================================
Index: SPECS/drbd.spec
diff -u SPECS/drbd.spec:1.90.4.13 SPECS/drbd.spec:1.90.4.14
--- SPECS/drbd.spec:1.90.4.13	Mon Oct 22 21:48:29 2007
+++ SPECS/drbd.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,10 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -37,7 +41,9 @@
 BuildRequires:	flex
 %endif
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build}
+%if %{with kernel}
 BuildRequires:	rpmbuild(macros) >= 1.330
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -209,6 +215,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90.4.14  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.90.4.13  2007/10/22 19:48:29  glen
 - allow build without up kernel
 

================================================================
Index: SPECS/eagle-usb.spec
diff -u SPECS/eagle-usb.spec:1.89.2.11 SPECS/eagle-usb.spec:1.89.2.12
--- SPECS/eagle-usb.spec:1.89.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/eagle-usb.spec	Mon Oct 22 22:24:59 2007
@@ -13,14 +13,19 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 # no USB in sparc(32) kernel; just build userspace to use with sparc64 kernel
 %undefine	with_kernel
 %endif
+#
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+#
 %define		_rel	55
 Summary:	Linux driver for the Eagle 8051 Analog (sagem f at st 800/840/908/...) modems
 Summary(pl):	Sterownik dla Linuksa do modemów Eagle 8051 Analog (sagem f at st 800/840/908/...)
@@ -211,6 +216,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89.2.12  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.89.2.11  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/em8300.spec
diff -u SPECS/em8300.spec:1.49.2.13 SPECS/em8300.spec:1.49.2.14
--- SPECS/em8300.spec:1.49.2.13	Mon Oct 22 21:37:04 2007
+++ SPECS/em8300.spec	Mon Oct 22 22:24:59 2007
@@ -11,19 +11,19 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 # kernel modules won't build on sparc32, no I2C in kernel
 %undefine	with_kernel
 %endif
-
+#
 %if %{without kernel}
 %undefine	with_dist_kernel
 %endif
-
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+#
 %define		_rel	55
 Summary:	DXR3 and H+ driver
 Summary(pl):	Sterowniki dla DXR3 i H+
@@ -46,8 +46,8 @@
 %endif
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
-%endif
 BuildRequires:	rpmbuild(macros) >= 1.308
+%endif
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 Provides:	dxr3
@@ -273,6 +273,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49.2.14  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.49.2.13  2007/10/22 19:37:04  glen
 - use %service
 

================================================================
Index: SPECS/ipp2p.spec
diff -u SPECS/ipp2p.spec:1.52.2.12 SPECS/ipp2p.spec:1.52.2.13
--- SPECS/ipp2p.spec:1.52.2.12	Mon Oct 22 21:48:29 2007
+++ SPECS/ipp2p.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,14 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%ifarch sparc
+%undefine	with_smp
+%endif
+#
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -28,19 +36,11 @@
 # Source0-md5:	9dd745830f302d70d0b728013c1d6a0c
 URL:		http://www.ipp2p.org/
 %{?with_userspace:BuildRequires:	iptables-devel >= 1.3.3}
-%if %{with kernel}
-%if %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
-%endif
-%endif
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.330
 BuildRequires:	sed >= 4.0
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%ifarch sparc
-%undefine	with_smp
-%endif
-
 %description
 IPP2P is a netfilter extension to identify P2P filesharing traffic.
 The main goal for developing IPP2P was giving the adminstrator a
@@ -252,6 +252,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52.2.13  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.52.2.12  2007/10/22 19:48:29  glen
 - allow build without up kernel
 

================================================================
Index: SPECS/libfuse.spec
diff -u SPECS/libfuse.spec:1.76.2.13 SPECS/libfuse.spec:1.76.2.14
--- SPECS/libfuse.spec:1.76.2.13	Mon Oct 22 22:02:23 2007
+++ SPECS/libfuse.spec	Mon Oct 22 22:24:59 2007
@@ -9,10 +9,6 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 %undefine	with_smp
 %endif
@@ -21,6 +17,10 @@
 %undefine with_dist_kernel
 %endif
 #
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+#
 %define		_rel	55
 Summary:	Filesystem in Userspace
 Summary(pl):	System plików w przestrzeni u¿ytkownika
@@ -265,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76.2.14  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.76.2.13  2007/10/22 20:02:23  glen
 - Provides group(fuse)
 

================================================================
Index: SPECS/ndiswrapper.spec
diff -u SPECS/ndiswrapper.spec:1.37.2.18 SPECS/ndiswrapper.spec:1.37.2.19
--- SPECS/ndiswrapper.spec:1.37.2.18	Mon Oct 15 10:26:44 2007
+++ SPECS/ndiswrapper.spec	Mon Oct 22 22:24:59 2007
@@ -9,6 +9,10 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
 %if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
 %define	alt_kernel	grsecurity
 %endif
@@ -219,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37.2.19  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.37.2.18  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/p2p.spec
diff -u SPECS/p2p.spec:1.23.2.14 SPECS/p2p.spec:1.23.2.15
--- SPECS/p2p.spec:1.23.2.14	Mon Oct 22 21:48:29 2007
+++ SPECS/p2p.spec	Mon Oct 22 22:24:59 2007
@@ -9,13 +9,17 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 %undefine	with_smp
 %endif
+#
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
 
 %define		no_install_post_compress_modules	1
 
@@ -35,12 +39,10 @@
 Patch1:		kernel-net-p2p-iptables.patch
 URL:		http://sourceforge.net/projects/iptables-p2p/
 %{?with_userspace:BuildRequires:	iptables-devel}
-%if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build}
 BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
-%{?with_dist_kernel:%requires_releq_kernel_up}
-Requires(post,postun):	/sbin/depmod
 Buildroot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -134,8 +136,6 @@
 %build
 %if %{with userspace}
 # iptables module
-# IPTABLES_VERSION=`rpm -q --queryformat '%{V}' iptables`
-IPTABLES_VERSION="%{iptables_ver}"
 cat << 'EOF' > iptables/Makefile
 CC		= %{__cc}
 CFLAGS		= %{rpmcflags} -fPIC -DIPTABLES_VERSION=\"%{iptables_ver}\"
@@ -211,6 +211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23.2.15  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.23.2.14  2007/10/22 19:48:29  glen
 - allow build without up kernel
 

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.85.2.17 SPECS/qemu.spec:1.85.2.18
--- SPECS/qemu.spec:1.85.2.17	Mon Oct 22 21:48:29 2007
+++ SPECS/qemu.spec	Mon Oct 22 22:24:59 2007
@@ -17,16 +17,20 @@
 %bcond_without	userspace		# don't build userspace utilities
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
-#
 # no kernel kqemu module for ppc
 %ifarch ppc
 %undefine      with_kqemu
 %undefine      with_kernel
 %endif
+#
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+
 %define	_kqemu_version	1.3.0pre11
 %define		_rel	55
 Summary:	QEMU CPU Emulator
@@ -59,8 +63,8 @@
 # This patch will be obsolete in versions after 0.9.0
 Patch14:	%{name}-0.9.0-remove-iohandlers.patch
 URL:		http://fabrice.bellard.free.fr/qemu/
-%if %{with kernel} && %{with dist_kernel}
-BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7
+%if %{with kernel}
+%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
 BuildRequires:	rpmbuild(macros) >= 1.330
 %endif
 %if %{with userspace}
@@ -342,6 +346,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85.2.18  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.85.2.17  2007/10/22 19:48:29  glen
 - allow build without up kernel
 

================================================================
Index: SPECS/rt2400.spec
diff -u SPECS/rt2400.spec:1.48.2.11 SPECS/rt2400.spec:1.48.2.12
--- SPECS/rt2400.spec:1.48.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/rt2400.spec	Mon Oct 22 22:24:59 2007
@@ -9,14 +9,18 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 %undefine	with_smp
 %endif
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+
 %define		snap	-cvs-20060911
 %define		_rel	55
 Summary:	Linux driver for WLAN cards based on RT2400
@@ -172,6 +176,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48.2.12  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.48.2.11  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/shfs.spec
diff -u SPECS/shfs.spec:1.66.2.11 SPECS/shfs.spec:1.66.2.12
--- SPECS/shfs.spec:1.66.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/shfs.spec	Mon Oct 22 22:24:59 2007
@@ -9,14 +9,18 @@
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
 %undefine	with_smp
 %endif
 #
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+#
+%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
+%define	alt_kernel	grsecurity
+%endif
+
 %define		_rel	55
 Summary:	(Secure) SHell FileSystem utilities
 Summary(pl):	Narzêdzia obs³uguj±ce system plików przez ssh
@@ -194,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66.2.12  2007/10/22 20:24:59  glen
+- unify kernel macros
+
 Revision 1.66.2.11  2007/10/15 08:26:44  glen
 - rel 55 (kernel 2.6.16.55)
 

================================================================
Index: SPECS/submount.spec
diff -u SPECS/submount.spec:1.22.2.11 SPECS/submount.spec:1.22.2.12
--- SPECS/submount.spec:1.22.2.11	Mon Oct 15 10:26:44 2007
+++ SPECS/submount.spec	Mon Oct 22 22:24:59 2007
@@ -9,14 +9,18 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	grsec_kernel	# build for kernel-grsecurity
 #
-%if %{with kernel} && %{with dist_kernel} && %{with grsec_kernel}
-%define	alt_kernel	grsecurity
-%endif
-#
 %ifarch sparc
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.12&r2=1.141.2.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy.spec?r1=1.38.2.16&r2=1.38.2.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia-legacy2.spec?r1=1.1.2.20&r2=1.1.2.21&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-nvidia.spec?r1=1.78.2.9.2.19&r2=1.78.2.9.2.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drbd.spec?r1=1.90.4.13&r2=1.90.4.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eagle-usb.spec?r1=1.89.2.11&r2=1.89.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/em8300.spec?r1=1.49.2.13&r2=1.49.2.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ipp2p.spec?r1=1.52.2.12&r2=1.52.2.13&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libfuse.spec?r1=1.76.2.13&r2=1.76.2.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ndiswrapper.spec?r1=1.37.2.18&r2=1.37.2.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/p2p.spec?r1=1.23.2.14&r2=1.23.2.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.17&r2=1.85.2.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rt2400.spec?r1=1.48.2.11&r2=1.48.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/shfs.spec?r1=1.66.2.11&r2=1.66.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/submount.spec?r1=1.22.2.11&r2=1.22.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/svgalib.spec?r1=1.165.2.11&r2=1.165.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/unionfs.spec?r1=1.24.2.16&r2=1.24.2.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zaptel.spec?r1=1.75.2.23&r2=1.75.2.24&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zd1211.spec?r1=1.28.4.13&r2=1.28.4.14&f=u



More information about the pld-cvs-commit mailing list