SPECS: zd1211.spec - update from AC-branch

[glen]

Author: glen                         Date: Thu Jul  3 10:43:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update from AC-branch

---- Files affected:
SPECS:
   zd1211.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/zd1211.spec
diff -u SPECS/zd1211.spec:1.32 SPECS/zd1211.spec:1.33
--- SPECS/zd1211.spec:1.32	Wed Dec 26 02:16:55 2007
+++ SPECS/zd1211.spec	Thu Jul  3 12:43:39 2008
@@ -9,30 +9,33 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	kernel		# don't build kernel modules
 %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
-#
+
 %define		zd1211_name	zd1211-driver-r85
 %define		rel		3
+%define		pname	zd1211
 Summary:	Linux driver for USB WLAN cards based on zd1211
 Summary(pl.UTF-8):	Sterownik dla Linuksa do kart bezprzewodowych USB opartych na układzie zd1211
-Name:		zd1211
+Name:		%{pname}%{_alt_kernel}
 Version:	0.0.2
 Release:	%{rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://zd1211.ath.cx/download/%{zd1211_name}.tgz
 # Source0-md5:	51691a15137fbc35515a630d45d03352
-Patch0:		kernel-net-%{name}-build.patch
+Patch0:		kernel-net-%{pname}-build.patch
+Patch1:		%{name}-3410.patch
 URL:		http://zd1211.ath.cx/
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.330
-Requires(post,postun):	/sbin/depmod
-Requires:	zd1211-firmware
 ExcludeArch:	sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,8 +49,8 @@
 %description -l de.UTF-8
 Linux Kernel Treiber für WLAN Netzwerkkarten zd1211.
 
-%package -n kernel%{_alt_kernel}-net-%{name}
-Summary:	Linux kernel module for WLAN cards based on zd1211 
+%package -n kernel%{_alt_kernel}-net-%{pname}
+Summary:	Linux kernel module for WLAN cards based on zd1211
 Summary(de.UTF-8):	Linux Kernel Modul für WLAN Netzwerkkarten zd1211
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla kart WLAN na zd1211
 Release:	%{rel}@%{_kernel_ver_str}
@@ -55,20 +58,23 @@
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
-Provides:	%{name}
+Requires:	zd1211-firmware
 
-%description -n kernel%{_alt_kernel}-net-%{name}
-This package contains Linux kernel drivers for the WLAN cards based on zd1211.
+%description -n kernel%{_alt_kernel}-net-%{pname}
+This package contains Linux kernel drivers for the WLAN cards based on
+zd1211.
 
-%description -n kernel%{_alt_kernel}-net-%{name} -l de.UTF-8
-Dieses Paket enthält Linux Kernel Treiber für WLAN Netzwerkkarten zd1211.
+%description -n kernel%{_alt_kernel}-net-%{pname} -l de.UTF-8
+Dieses Paket enthält Linux Kernel Treiber für WLAN Netzwerkkarten
+zd1211.
 
-%description -n kernel%{_alt_kernel}-net-%{name} -l pl.UTF-8
+%description -n kernel%{_alt_kernel}-net-%{pname} -l pl.UTF-8
 Ten pakiet zawiera sterowniki jądra Linuksa dla kart WLAN na zd1211.
 
 %prep
 %setup -q -n %{zd1211_name}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %build_kernel_modules -m zd1211
@@ -96,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2008/07/03 10:43:39  glen
+- update from AC-branch
+
 Revision 1.32  2007/12/26 01:16:55  qboosh
 - cleanup/unified
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/zd1211.spec?r1=1.32&r2=1.33&f=u