# kernel_version : 2.6.22.14
%define name madwifi
-%define version 0.9.4
-%define taglevel 1
+%define version 4132
+%define taglevel 0
+
+%define actual_name %{name}-trunk-r%{version}-20100921
%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
-%define kernel_id %{kernel_version}-%{kernel_release}
+
+# guess which convention is used; k27 and before used dash, k32 uses dot
+%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch}
+%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch}
+%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} )
+
+# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686
+# the k27 and before does not have the -i686 part
+%define kernel_id_old %{kernel_version}-%{kernel_release}
+%define kernel_id_new %{kernel_version}-%{kernel_release}-%{_target_cpu}
+%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
Summary: madwifi Atheros driver
Name: %{name}
Release: %{release}
License: GPL
Group: System Environment/Kernel
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{actual_name}.tar.gz
Source1: ifup-pre-local
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
madwifi is a new generation driver for the Atheros chipset
%prep
-%setup
+%setup -n %{actual_name}
%build
rm -rf $RPM_BUILD_ROOT
-# with the new build, we use the kernel-devel rpm for building
-%define kernelpath /usr/src/kernels/%{kernel_id_arch}
-
%__make KERNELPATH=%kernelpath clean
%__make KERNELPATH=%kernelpath
/lib/modules/%{kernel_id}/net/wlan_tkip.ko
/lib/modules/%{kernel_id}/net/wlan_wep.ko
/lib/modules/%{kernel_id}/net/wlan_xauth.ko
+/lib/modules/%{kernel_id}/net/ath_rate_minstrel.ko
/sbin/80211debug
/sbin/80211stats
/sbin/athchans
/sbin/athkey
/sbin/athstats
/sbin/wlanconfig
+/sbin/ath_info
/sbin/ifup-pre-local
+/sbin/madwifi-unload
+/sbin/wpakey
%{_mandir}/man8/80211debug.8*
%{_mandir}/man8/80211stats.8*
%{_mandir}/man8/athchans.8*
%{_mandir}/man8/athkey.8*
%{_mandir}/man8/athstats.8*
%{_mandir}/man8/wlanconfig.8*
+%{_mandir}/man8/ath_info.8*
%post
fi
%changelog
+* Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-0.9.4-2
+- specfile adjustments for 0.9.4
+
* Tue Dec 04 2007 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
- updated to build against kernel-devel