[svn] r5235 - trunk/rpms/madwifi

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Tue Mar 20 12:39:54 CET 2007


Author: thias
Date: 2007-03-20 12:39:53 +0100 (Tue, 20 Mar 2007)
New Revision: 5235

Added:
   trunk/rpms/madwifi/madwifi-0.9.3-noWerr.patch
Removed:
   trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch
   trunk/rpms/madwifi/madwifi-2.6.18-config.patch
Modified:
   trunk/rpms/madwifi/madwifi.spec
Log:
Update madwifi to 0.9.3.


Deleted: trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch
===================================================================
--- trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch	2007-03-20 10:02:21 UTC (rev 5234)
+++ trunk/rpms/madwifi/madwifi-0.9.2.1-noWerr.patch	2007-03-20 11:39:53 UTC (rev 5235)
@@ -1,11 +0,0 @@
-diff -Naupr madwifi-0.9.2.1.orig/Makefile.inc madwifi-0.9.2.1/Makefile.inc
---- madwifi-0.9.2.1.orig/Makefile.inc	2006-07-14 07:15:56.000000000 +0200
-+++ madwifi-0.9.2.1/Makefile.inc	2007-01-09 10:42:49.000000000 +0100
-@@ -181,7 +181,6 @@ endif
- # 
- TOOLS=  $(DEPTH)/tools 
- 
--COPTS+=	-Werror
- INCS=	-include $(obj)/$(DEPTH)/include/compat.h -I$(obj)/$(DEPTH)/include
- 
- ifeq ($(strip $(BUS)),AHB)

Added: trunk/rpms/madwifi/madwifi-0.9.3-noWerr.patch
===================================================================
--- trunk/rpms/madwifi/madwifi-0.9.3-noWerr.patch	                        (rev 0)
+++ trunk/rpms/madwifi/madwifi-0.9.3-noWerr.patch	2007-03-20 11:39:53 UTC (rev 5235)
@@ -0,0 +1,11 @@
+diff -Naupr madwifi-0.9.3.orig/Makefile.inc madwifi-0.9.3/Makefile.inc
+--- madwifi-0.9.3.orig/Makefile.inc	2007-01-18 09:26:23.000000000 +0100
++++ madwifi-0.9.3/Makefile.inc	2007-03-19 18:00:54.000000000 +0100
+@@ -146,7 +146,6 @@ ATH_RATE=	$(TOP)/ath_rate
+ # 
+ TOOLS=  $(TOP)/tools 
+ 
+-COPTS+=	-Werror
+ INCS=	-include $(TOP)/include/compat.h -I$(TOP)/include
+ 
+ # TARGET defines the target platform architecture. It must match one of

Deleted: trunk/rpms/madwifi/madwifi-2.6.18-config.patch
===================================================================
--- trunk/rpms/madwifi/madwifi-2.6.18-config.patch	2007-03-20 10:02:21 UTC (rev 5234)
+++ trunk/rpms/madwifi/madwifi-2.6.18-config.patch	2007-03-20 11:39:53 UTC (rev 5235)
@@ -1,341 +0,0 @@
-diff -ur madwifi-ng-r1708-20060907.orig/ath/if_ath_ahb.c madwifi-ng-r1708-20060907/ath/if_ath_ahb.c
---- madwifi-ng-r1708-20060907.orig/ath/if_ath_ahb.c	2006-05-21 21:39:55.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath/if_ath_ahb.c	2006-09-07 08:33:31.000000000 -0700
-@@ -10,7 +10,6 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/ath/if_ath.c madwifi-ng-r1708-20060907/ath/if_ath.c
---- madwifi-ng-r1708-20060907.orig/ath/if_ath.c	2006-09-02 21:39:21.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath/if_ath.c	2006-09-07 08:33:31.000000000 -0700
-@@ -44,7 +44,6 @@
-  */
- #include "opt_ah.h"
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/ath/if_ath_pci.c madwifi-ng-r1708-20060907/ath/if_ath_pci.c
---- madwifi-ng-r1708-20060907.orig/ath/if_ath_pci.c	2006-07-21 01:00:32.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath/if_ath_pci.c	2006-09-07 08:33:31.000000000 -0700
-@@ -42,7 +42,6 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/ath_rate/amrr/amrr.c madwifi-ng-r1708-20060907/ath_rate/amrr/amrr.c
---- madwifi-ng-r1708-20060907.orig/ath_rate/amrr/amrr.c	2006-07-04 03:23:35.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath_rate/amrr/amrr.c	2006-09-07 08:33:31.000000000 -0700
-@@ -43,7 +43,6 @@
-  * "IEEE 802.11 Rate Adaptation: A Practical Approach" by
-  *    Mathieu Lacage, Hossein Manshaei, Thierry Turletti
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/ath_rate/onoe/onoe.c madwifi-ng-r1708-20060907/ath_rate/onoe/onoe.c
---- madwifi-ng-r1708-20060907.orig/ath_rate/onoe/onoe.c	2006-07-04 03:23:35.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath_rate/onoe/onoe.c	2006-09-07 08:33:31.000000000 -0700
-@@ -39,7 +39,6 @@
- /*
-  * Atsushi Onoe's rate control algorithm.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/ath_rate/sample/sample.c madwifi-ng-r1708-20060907/ath_rate/sample/sample.c
---- madwifi-ng-r1708-20060907.orig/ath_rate/sample/sample.c	2006-07-04 03:23:35.000000000 -0700
-+++ madwifi-ng-r1708-20060907/ath_rate/sample/sample.c	2006-09-07 08:33:31.000000000 -0700
-@@ -41,7 +41,6 @@
-  * John Bicket's SampleRate control algorithm.
-  */
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/hal/linux/ah_osdep.c madwifi-ng-r1708-20060907/hal/linux/ah_osdep.c
---- madwifi-ng-r1708-20060907.orig/hal/linux/ah_osdep.c	2006-05-19 03:25:45.000000000 -0700
-+++ madwifi-ng-r1708-20060907/hal/linux/ah_osdep.c	2006-09-07 08:33:31.000000000 -0700
-@@ -41,7 +41,6 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_acl.c madwifi-ng-r1708-20060907/net80211/ieee80211_acl.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_acl.c	2006-05-31 14:05:08.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_acl.c	2006-09-07 08:33:31.000000000 -0700
-@@ -45,7 +45,6 @@
-  * and if found the frame is either accepted (ACL_POLICY_ALLOW)
-  * or rejected (ACL_POLICY_DENT).
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_beacon.c madwifi-ng-r1708-20060907/net80211/ieee80211_beacon.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_beacon.c	2006-05-19 13:42:19.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_beacon.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 beacon handling routines
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211.c madwifi-ng-r1708-20060907/net80211/ieee80211.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211.c	2006-07-04 03:22:11.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 generic handler
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto.c madwifi-ng-r1708-20060907/net80211/ieee80211_crypto.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_crypto.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 generic crypto support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_ccmp.c madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_ccmp.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_ccmp.c	2006-06-13 07:09:51.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_ccmp.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
-  * AP driver. The code is used with the consent of the author and
-  * it's license is included below.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_none.c madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_none.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_none.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_none.c	2006-09-07 08:34:29.000000000 -0700
-@@ -34,7 +34,6 @@
- /*
-  * IEEE 802.11 NULL crypto support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_tkip.c madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_tkip.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_tkip.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_tkip.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
-  * AP driver. The code is used with the consent of the author and
-  * it's license is included below.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_wep.c madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_wep.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_crypto_wep.c	2006-02-06 12:20:57.000000000 -0800
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_crypto_wep.c	2006-09-07 08:33:30.000000000 -0700
-@@ -34,7 +34,6 @@
- /*
-  * IEEE 802.11 WEP crypto support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_input.c madwifi-ng-r1708-20060907/net80211/ieee80211_input.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_input.c	2006-07-05 20:23:08.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_input.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 input handling.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_linux.c madwifi-ng-r1708-20060907/net80211/ieee80211_linux.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_linux.c	2006-07-21 01:59:10.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_linux.c	2006-09-07 08:34:29.000000000 -0700
-@@ -33,7 +33,6 @@
- /*
-  * IEEE 802.11 support (Linux-specific code)
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_monitor.c madwifi-ng-r1708-20060907/net80211/ieee80211_monitor.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_monitor.c	2006-09-05 19:24:34.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_monitor.c	2006-09-07 08:34:29.000000000 -0700
-@@ -34,7 +34,6 @@
- /*
-  * IEEE 802.11 monitor mode 
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kmod.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_node.c madwifi-ng-r1708-20060907/net80211/ieee80211_node.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_node.c	2006-06-13 01:50:37.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_node.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 node handling support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_output.c madwifi-ng-r1708-20060907/net80211/ieee80211_output.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_output.c	2006-06-09 19:17:05.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_output.c	2006-09-07 08:33:31.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 output handling.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_power.c madwifi-ng-r1708-20060907/net80211/ieee80211_power.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_power.c	2006-06-09 19:17:05.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_power.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 power save support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_proto.c madwifi-ng-r1708-20060907/net80211/ieee80211_proto.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_proto.c	2006-08-08 07:24:15.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_proto.c	2006-09-07 08:34:29.000000000 -0700
-@@ -38,7 +38,6 @@
- /*
-  * IEEE 802.11 protocol support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/kmod.h>
- #include <linux/module.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan_ap.c madwifi-ng-r1708-20060907/net80211/ieee80211_scan_ap.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan_ap.c	2006-08-08 05:24:37.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_scan_ap.c	2006-09-07 08:34:29.000000000 -0700
-@@ -37,7 +37,6 @@
- /*
-  * IEEE 802.11 ap scanning support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan.c madwifi-ng-r1708-20060907/net80211/ieee80211_scan.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan.c	2006-08-08 05:24:37.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_scan.c	2006-09-07 08:34:29.000000000 -0700
-@@ -37,7 +37,6 @@
- /*
-  * IEEE 802.11 scanning support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan_sta.c madwifi-ng-r1708-20060907/net80211/ieee80211_scan_sta.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_scan_sta.c	2006-08-08 05:24:37.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_scan_sta.c	2006-09-07 08:34:29.000000000 -0700
-@@ -37,7 +37,6 @@
- /*
-  * IEEE 802.11 station scanning support.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/skbuff.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_wireless.c madwifi-ng-r1708-20060907/net80211/ieee80211_wireless.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_wireless.c	2006-08-10 22:35:30.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_wireless.c	2006-09-07 08:34:29.000000000 -0700
-@@ -39,7 +39,6 @@
- /*
-  * Wireless extensions support for 802.11 common code.
-  */
--#include <linux/config.h>
- 
- #ifdef CONFIG_NET_WIRELESS
- #include <linux/version.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/ieee80211_xauth.c madwifi-ng-r1708-20060907/net80211/ieee80211_xauth.c
---- madwifi-ng-r1708-20060907.orig/net80211/ieee80211_xauth.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/net80211/ieee80211_xauth.c	2006-09-07 08:34:29.000000000 -0700
-@@ -46,7 +46,6 @@
-  * of the available callbacks--the user mode authenticator process works
-  * entirely from messages about stations joining and leaving.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/net80211/if_media.c madwifi-ng-r1708-20060907/net80211/if_media.c
---- madwifi-ng-r1708-20060907.orig/net80211/if_media.c	2006-05-31 14:05:08.000000000 -0700
-+++ madwifi-ng-r1708-20060907/net80211/if_media.c	2006-09-07 08:33:40.000000000 -0700
-@@ -49,7 +49,6 @@
- #define	EXPORT_SYMTAB
- #endif
- 
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
-diff -ur madwifi-ng-r1708-20060907.orig/regression/ccmp/test_ccmp.c madwifi-ng-r1708-20060907/regression/ccmp/test_ccmp.c
---- madwifi-ng-r1708-20060907.orig/regression/ccmp/test_ccmp.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/regression/ccmp/test_ccmp.c	2006-09-07 08:34:29.000000000 -0700
-@@ -44,7 +44,6 @@
-  * you want; e.g. insmod ccmp_test tests=7 will run only test mpdu's
-  * 1, 2, and 3.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/regression/tkip/test_tkip.c madwifi-ng-r1708-20060907/regression/tkip/test_tkip.c
---- madwifi-ng-r1708-20060907.orig/regression/tkip/test_tkip.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/regression/tkip/test_tkip.c	2006-09-07 08:34:26.000000000 -0700
-@@ -34,7 +34,6 @@
- /*
-  * TKIP test module.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>
-diff -ur madwifi-ng-r1708-20060907.orig/regression/wep/test_wep.c madwifi-ng-r1708-20060907/regression/wep/test_wep.c
---- madwifi-ng-r1708-20060907.orig/regression/wep/test_wep.c	2006-02-01 12:07:11.000000000 -0800
-+++ madwifi-ng-r1708-20060907/regression/wep/test_wep.c	2006-09-07 08:34:29.000000000 -0700
-@@ -44,7 +44,6 @@
-  * you want; e.g. insmod wep_test tests=7 will run only test mpdu's
-  * 1, 2, and 3.
-  */
--#include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
- #include <linux/init.h>

Modified: trunk/rpms/madwifi/madwifi.spec
===================================================================
--- trunk/rpms/madwifi/madwifi.spec	2007-03-20 10:02:21 UTC (rev 5234)
+++ trunk/rpms/madwifi/madwifi.spec	2007-03-20 11:39:53 UTC (rev 5235)
@@ -3,14 +3,13 @@
 
 Summary: Multiband Atheros Driver for Wireless Fidelity
 Name: madwifi
-Version: 0.9.2.1
+Version: 0.9.3
 Release: 2
 License: GPL
 Group: System Environment/Kernel
 URL: http://madwifi.org/
-Source: http://dl.sf.net/sourceforge/madwifi/madwifi-%{version}.tar.bz2
-Patch0: madwifi-2.6.18-config.patch
-Patch1: madwifi-0.9.2.1-noWerr.patch
+Source: http://downloads.sf.net/madwifi/madwifi-%{version}.tar.bz2
+Patch0: madwifi-0.9.3-noWerr.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: gcc, make
 Requires(post): dkms
@@ -28,8 +27,7 @@
 
 %prep
 %setup
-%patch0 -p1 -b .config
-%patch1 -p1 -b .noWerr
+%patch0 -p1 -b .noWerr
 
 
 %build
@@ -56,7 +54,7 @@
 
 # Kernel module sources install for dkms
 %{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
-%{__cp} -a ath/ ath_rate/ hal/ include/ net80211/ scripts/ \
+%{__cp} -a ath/ ath_hal/ ath_rate/ hal/ include/ net80211/ scripts/ \
     BuildCaps.inc kernelversion.c Makefile Makefile.inc release.h \
     %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
@@ -68,7 +66,7 @@
 BUILT_MODULE_NAME[0]=ath_pci
 BUILT_MODULE_LOCATION[0]=ath
 BUILT_MODULE_NAME[1]=ath_hal
-BUILT_MODULE_LOCATION[1]=ath
+BUILT_MODULE_LOCATION[1]=ath_hal
 BUILT_MODULE_NAME[2]=wlan
 BUILT_MODULE_LOCATION[2]=net80211
 BUILT_MODULE_NAME[3]=wlan_acl
@@ -85,8 +83,12 @@
 BUILT_MODULE_LOCATION[8]=net80211
 BUILT_MODULE_NAME[9]=wlan_xauth
 BUILT_MODULE_LOCATION[9]=net80211
-BUILT_MODULE_NAME[10]=ath_rate_sample
-BUILT_MODULE_LOCATION[10]=ath_rate/sample
+BUILT_MODULE_NAME[10]=ath_rate_amrr
+BUILT_MODULE_LOCATION[10]=ath_rate/amrr
+BUILT_MODULE_NAME[11]=ath_rate_onoe
+BUILT_MODULE_LOCATION[11]=ath_rate/onoe
+BUILT_MODULE_NAME[12]=ath_rate_sample
+BUILT_MODULE_LOCATION[12]=ath_rate/sample
 DEST_MODULE_LOCATION[0]=/kernel/drivers/net/wireless
 DEST_MODULE_LOCATION[1]=/kernel/drivers/net/wireless
 DEST_MODULE_LOCATION[2]=/kernel/drivers/net/wireless
@@ -98,6 +100,8 @@
 DEST_MODULE_LOCATION[8]=/kernel/drivers/net/wireless
 DEST_MODULE_LOCATION[9]=/kernel/drivers/net/wireless
 DEST_MODULE_LOCATION[10]=/kernel/drivers/net/wireless
+DEST_MODULE_LOCATION[11]=/kernel/drivers/net/wireless
+DEST_MODULE_LOCATION[12]=/kernel/drivers/net/wireless
 AUTOINSTALL="YES"
 EOF
 
@@ -127,6 +131,15 @@
 
 
 %changelog
+* Tue Mar 20 2007 Matthias Saou <http://freshrpms.net/> 0.9.3-2
+- Commit with the new "ath_hal" directory added.
+- Commit with the two new ath_rate_amrr and ath_rate_onoe modules added.
+
+* Mon Mar 19 2007 Matthias Saou <http://freshrpms.net/> 0.9.3-1
+- Update to 0.9.3, which works with 2.6.20+ kernels.
+- Remove no longer needed 2.6.18-config patch.
+- Update noWerr patch (kept just in case the same happens again).
+
 * Tue Jan  9 2007 Matthias Saou <http://freshrpms.net/> 0.9.2.1-2
 - Add patch to remove -Werr since warnings are printed with recent FC6 kernels.
 



More information about the svn-commits mailing list