SPECS: madwifi-ng.spec - updated tarball URL - updated to 2005.12....

[zboczuch]

Author: zboczuch                     Date: Fri Dec 30 19:31:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated tarball URL
- updated to 2005.12.30 snapshot version
- added source md5
- hm... currently ath_rate_sample builds, ath_rate_onoe does not; it needs
  more time to research it
- pass 'r' letter to 'make intall' due to script which asks for cleaning
  previously found madwifi installations

---- Files affected:
SPECS:
   madwifi-ng.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.2 SPECS/madwifi-ng.spec:1.3
--- SPECS/madwifi-ng.spec:1.2	Mon Oct 24 22:34:55 2005
+++ SPECS/madwifi-ng.spec	Fri Dec 30 20:31:51 2005
@@ -14,17 +14,18 @@
 Name:		madwifi-ng
 Version:	0
 %define		snap_year	2005
-%define		snap_month	10
-%define		snap_day	21
+%define		snap_month	12
+%define		snap_day	30
 %define		snap	%{snap_year}%{snap_month}%{snap_day}
 %define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
 %define		_rel	0.%{snap}.1
-%define		trunk	r1195
+%define		trunk	r1370
 Release:	%{_rel}
 Epoch:		0
 License:	GPL/BSD (partial source)
 Group:		Base/Kernel
-Source0:	http://snapshots.madwifi.org/madwifi-trunk-%{trunk}-%{snap}.tar.gz
+Source0:	http://snapshots.madwifi.org/madwifi-ng/%{name}-%{trunk}-%{snap}.tar.gz
+# Source0-md5:	3fe749bf48a7f1edffffd7be8e394b47
 URL:		http://www.madwifi.org/
 %if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
@@ -97,7 +98,7 @@
 Ten pakiet zawiera moduł jądra Linuksa SMP.
 
 %prep
-%setup -q -n madwifi-trunk-%{trunk}-%{snap}
+%setup -q -n madwifi-ng-%{trunk}-%{snap}
 
 %build
 %if %{with userspace}
@@ -139,10 +140,10 @@
 
 	mv ath/ath_pci{,-$cfg}.ko
 	mv ath_hal/ath_hal{,-$cfg}.ko
-# default is ath_rate_onoe, not rate_sample
-#	mv ath_rate/sample/ath_rate_sample{,-$cfg}.ko
-#
-	mv ath_rate/onoe/ath_rate_onoe{,-$cfg}.ko
+# default is ath_rate_sample now compiles, _onoe does not
+	mv ath_rate/sample/ath_rate_sample{,-$cfg}.ko
+#	mv ath_rate/onoe/ath_rate_onoe{,-$cfg}.ko
+
 	for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
 		mv net80211/$i{,-$cfg}.ko
 	done
@@ -165,7 +166,7 @@
 #install tools/wlanstats $RPM_BUILD_ROOT%{_bindir}/wlanstats
 #install tools/wlandebug $RPM_BUILD_ROOT%{_bindir}/wlandebug
 
-%{__make} -C tools install \
+echo r | %{__make} -C tools install \
 	KERNELCONF="%{_kernelsrcdir}/config-up" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir}
@@ -183,10 +184,10 @@
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_pci.ko
 install ath_hal/ath_hal-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_hal.ko
-#install ath_rate/sample/ath_rate_sample-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_rate_sample.ko
-install ath_rate/onoe/ath_rate_onoe-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_rate_onoe.ko
+install ath_rate/sample/ath_rate_sample-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_rate_sample.ko
+#install ath_rate/onoe/ath_rate_onoe-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
+#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ath_rate_onoe.ko
 for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
 	install net80211/$i-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/$i.ko
@@ -196,10 +197,10 @@
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_pci.ko
 install ath_hal/ath_hal-smp.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_hal.ko
-#install ath_rate/sample/ath_rate_sample-smp.ko \
-#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_rate_sample.ko
-install ath_rate/onoe/ath_rate_onoe-smp.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_rate_onoe.ko
+install ath_rate/sample/ath_rate_sample-smp.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_rate_sample.ko
+#install ath_rate/onoe/ath_rate_onoe-smp.ko \
+#	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/ath_rate_onoe.ko
 for i in wlan_wep wlan_xauth wlan_acl wlan_ccmp wlan_tkip wlan; do
 	install net80211/$i-smp.ko \
 		$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/net/$i.ko
@@ -253,6 +254,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/12/30 19:31:51  zboczuch
+- updated tarball URL
+- updated to 2005.12.30 snapshot version
+- added source md5
+- hm... currently ath_rate_sample builds, ath_rate_onoe does not; it needs
+  more time to research it
+- pass 'r' letter to 'make intall' due to script which asks for cleaning
+  previously found madwifi installations
+
 Revision 1.2  2005/10/24 20:34:55  qboosh
 - added missing rcs tags and rev 1.1 commit message
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi-ng.spec?r1=1.2&r2=1.3&f=u