SPECS: madwifi-old-openhal.spec - up to r2365 (some new hardware a...

[mguevara]

Author: mguevara                     Date: Fri May 25 09:27:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to r2365 (some new hardware added)
- new kernel macro stuff 

---- Files affected:
SPECS:
   madwifi-old-openhal.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/madwifi-old-openhal.spec
diff -u SPECS/madwifi-old-openhal.spec:1.11 SPECS/madwifi-old-openhal.spec:1.12
--- SPECS/madwifi-old-openhal.spec:1.11	Wed Mar  7 13:31:33 2007
+++ SPECS/madwifi-old-openhal.spec	Fri May 25 11:27:32 2007
@@ -3,17 +3,16 @@
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
 %bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %define		snap_year	2007
-%define		snap_month	02
-%define		snap_day	25
+%define		snap_month	05
+%define		snap_day	24
 %define		snap	%{snap_year}%{snap_month}%{snap_day}
 %define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
-%define		_rel	0.%{snap}.2
-%define		trunk	r2157
+%define		_rel	0.%{snap}.1
+%define		trunk	r2365
 Summary:	Atheros WiFi card driver
 Summary(pl.UTF-8):	Sterownik karty radiowej Atheros
 Name:		madwifi-old-openhal
@@ -23,9 +22,9 @@
 Group:		Base/Kernel
 Provides:	madwifi
 Obsoletes:	madwifi
-# http://snapshots.madwifi.org/madwifi-old-openhal/madwifi-old-openhal-r2157-20070225.tar.gz
+# http://snapshots.madwifi.org/madwifi-old-openhal/madwifi-old-openhal-r2365-20070524.tar.gz
 Source0:	http://snapshots.madwifi.org/madwifi-old-openhal/%{name}-%{trunk}-%{snap}.tar.gz
-# Source0-md5:	720045374d0df8bc88e6c75c0a6ade00
+# Source0-md5:	97f45d92f11638a7637a41620177852f
 # needed when build against (more noisy) pax enabled kernel
 Patch0:		%{name}-werror.patch
 URL:		http://www.madwifi.org/
@@ -67,8 +66,8 @@
 Group:		Base/Kernel
 Requires(post,postun):	/sbin/depmod
 %if %{with dist_kernel}
-%requires_releq_kernel_up
-Requires(postun):	%releq_kernel_up
+%requires_releq_kernel
+Requires(postun):	%releq_kernel
 %endif
 
 %description -n kernel%{_alt_kernel}-net-madwifi-old-openhal
@@ -81,27 +80,6 @@
 
 Ten pakiet zawiera moduł jądra Linuksa.
 
-%package -n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal
-Summary:	Linux SMP driver for %{name} cards
-Summary(pl.UTF-8):	Sterownik dla Linuksa SMP do kart %{name}
-Release:	%{_rel}@%{_kernel_ver_str}
-Group:		Base/Kernel
-Requires(post,postun):	/sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel_smp
-Requires(postun):	%releq_kernel_smp
-%endif
-
-%description -n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal
-This is driver for Atheros cards for Linux.
-
-This package contains Linux SMP module.
-
-%description -n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal -l pl.UTF-8
-Sterownik dla Linuksa do kart Atheros.
-
-Ten pakiet zawiera moduł jądra Linuksa SMP.
-
 %prep
 %setup -q -n %{name}-%{trunk}-%{snap}
 %patch0 -p1
@@ -111,7 +89,7 @@
 %{__make} -C tools \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
-	KERNELCONF="%{_kernelsrcdir}/config-up"
+	KERNELCONF="%{_kernelsrcdir}/config-dist"
 %endif
 
 %if %{with kernel}
@@ -150,7 +128,7 @@
 
 %{__make} install-tools \
 	TARGET=%{target} \
-	KERNELCONF="%{_kernelsrcdir}/config-up" \
+	KERNELCONF="%{_kernelsrcdir}/config-dist" \
 	KERNELPATH="%{_kernelsrcdir}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
@@ -176,12 +154,6 @@
 %postun	-n kernel%{_alt_kernel}-net-madwifi-old-openhal
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal
-%depmod %{_kernel_ver}smp
-
-%postun	-n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -198,12 +170,6 @@
 %files -n kernel%{_alt_kernel}-net-madwifi-old-openhal
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/kernel/net/*.ko*
-
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-net-madwifi-old-openhal
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/net/*.ko*
-%endif
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -212,6 +178,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/05/25 09:27:32  mguevara
+- up to r2365 (some new hardware added)
+- new kernel macro stuff
+
 Revision 1.11  2007/03/07 12:31:33  mguevara
 - _rel 0.2
 - added madwifi-old-openhal-werror.patch for kernel-pax (and grsecurity?)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi-old-openhal.spec?r1=1.11&r2=1.12&f=u