SPECS: rt2400.spec - merge alt_kernel stuff from AC-branch - drop grsec_ker...

[glen]

Author: glen                         Date: Thu Jul  3 13:11:00 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge alt_kernel stuff from AC-branch
- drop grsec_kernel bcond

---- Files affected:
SPECS:
   rt2400.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/rt2400.spec
diff -u SPECS/rt2400.spec:1.57 SPECS/rt2400.spec:1.58
--- SPECS/rt2400.spec:1.57	Fri Mar 14 01:22:42 2008
+++ SPECS/rt2400.spec	Thu Jul  3 15:10:55 2008
@@ -5,28 +5,35 @@
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	userspace	# don't build userspace module
 %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
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+%if "%{_alt_kernel}" != "%{nil}"
+%undefine	with_userspace
+%endif
+%if %{without userspace}
+# nothing to be placed to debuginfo package
+%define		_enable_debug_packages	0
 %endif
-#
+
+%define		rel		7
 %define		snap	-cvs-20060911
-%define		_rel	7
+%define		pname	rt2400
 Summary:	Linux driver for WLAN cards based on RT2400
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie RT2400
-Name:		rt2400
+Name:		%{pname}%{_alt_kernel}
 Version:	1.2.2
-Release:	%{_rel}
+Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
-# Source0:	http://dl.sourceforge.net/rt2400/%{name}-%{version}%{snap}.tar.gz
-Source0:	%{name}-%{version}%{snap}.tar.bz2
+# Source0:	http://dl.sourceforge.net/rt2400/%{pname}-%{version}%{snap}.tar.gz
+Source0:	%{pname}-%{version}%{snap}.tar.bz2
 # Source0-md5:	5a0c2c65af1364b215d56be2b881e24f
-Patch0:		%{name}-inc.patch
-Patch1:		%{name}-wireless_stats.patch
-Patch2:		%{name}-skb.patch
-Patch3:		%{name}-2.6.24.patch
+Patch0:		%{pname}-inc.patch
+Patch1:		%{pname}-wireless_stats.patch
+Patch2:		%{pname}-skb.patch
+Patch3:		%{pname}-2.6.24.patch
 URL:		http://rt2x00.serialmonkey.com/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -51,7 +58,7 @@
 %package -n kernel%{_alt_kernel}-net-rt2400
 Summary:	Linux driver for WLAN cards based on RT2400
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart bezprzewodowych opartych na układzie RT2400
-Release:	%{_rel}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
@@ -71,7 +78,7 @@
 Ten pakiet zawiera moduł jądra Linuksa.
 
 %prep
-%setup -q -n %{name}-%{version}%{snap}
+%setup -q -n %{pname}-%{version}%{snap}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -143,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2008/07/03 13:10:55  glen
+- merge alt_kernel stuff from AC-branch
+- drop grsec_kernel bcond
+
 Revision 1.57  2008/03/14 00:22:42  zbyniu
 - proper kernel related R
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rt2400.spec?r1=1.57&r2=1.58&f=u