SPECS: kernel-net-zd1211.spec - TH kernel ready

[areq]

Author: areq                         Date: Thu May 31 19:11:47 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- TH kernel ready

---- Files affected:
SPECS:
   kernel-net-zd1211.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/kernel-net-zd1211.spec
diff -u SPECS/kernel-net-zd1211.spec:1.28 SPECS/kernel-net-zd1211.spec:1.29
--- SPECS/kernel-net-zd1211.spec:1.28	Mon Mar 19 15:55:02 2007
+++ SPECS/kernel-net-zd1211.spec	Thu May 31 21:11:41 2007
@@ -9,9 +9,6 @@
 #
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
-%bcond_without	kernel		# don't build kernel modules
-%bcond_without	up		# don't build UP module
-%bcond_without	smp		# don't build SMP module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		_zd1211_ver	0.0.2
@@ -28,7 +25,7 @@
 # Source0-md5:	51691a15137fbc35515a630d45d03352
 Patch0:		kernel-net-%{name}-build.patch
 URL:		http://zd1211.ath.cx/
-%{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.7}
+%{?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
@@ -51,7 +48,7 @@
 Summary(pl.UTF-8):	Moduł jądra Linuksa dla kart WLAN na zd1211
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	module-init-tools >= 3.2.2-2
 Provides:	%{name}
@@ -65,26 +62,6 @@
 %description -n kernel%{_alt_kernel}-net-%{name} -l pl.UTF-8
 Ten pakiet zawiera sterowniki jądra Linuksa dla kart WLAN na zd1211.
 
-%package -n kernel%{_alt_kernel}-smp-net-%{name}
-Summary:	Linux SMP kernel module for the WLAN cards based on zd1211.
-Summary(de.UTF-8):	Linux SMP Kernel Modul für WLAN Netzwerkkarten zd1211
-Summary(pl.UTF-8):	Moduł jądra Linuksa SMP dla kart WLAN na zd1211
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Requires:	module-init-tools >= 3.2.2-2
-Provides:	%{name}
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name}
-This package contains Linux SMP kernel drivers for the WLAN cards based on zd1211.
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name} -l de.UTF-8
-Dieses Paket enthält Linux SMP Kernel Treiber für WLAN Netzwerkkarten zd1211.
-
-%description -n kernel%{_alt_kernel}-smp-net-%{name} -l pl.UTF-8
-Ten pakiet zawiera sterowniki jądra Linuksa SMP dla kart WLAN opartych na układzie zd1211.
-
 %prep
 %setup -q -n %{_zd1211_name}
 %patch0 -p1
@@ -105,25 +82,9 @@
 %postun	-n kernel%{_alt_kernel}-net-%{name}
 %depmod	%{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-%{name}
-%depmod	%{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-net-%{name}
-%depmod	%{_kernel_ver}smp
-
-%if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-net-%{name}
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
-#%{_sysconfdir}/modprobe.d/%{_kernel_ver}/%{name}.conf
-%endif
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-%{name}
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
-#%{_sysconfdir}/modprobe.d/%{_kernel_ver}smp/%{name}.conf
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -131,6 +92,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2007/05/31 19:11:41  areq
+- TH kernel ready
+
 Revision 1.28  2007/03/19 14:55:02  wolvverine
 - cosmetics
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-net-zd1211.spec?r1=1.28&r2=1.29&f=u