X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=ab99dfdae4453b0ac7097175f435c97e2070827c;hb=07bab9676367f0b8d6e8b2d2859282538af2fd3b;hp=502e4cbdab5af077ed21da05d974d752b47b3a09;hpb=785c0cd9973c1e30ae468eefb75d6a9095fe6dc6;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 502e4cb..ab99dfd 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,8 +1,3 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 # License is GPL.
@@ -12,12 +7,23 @@
 # kernel_version : 2.6.22.14
 
 %define name madwifi
-%define version 0.9.4
-%define taglevel 2
+%define version 4132
+%define taglevel 1
+
+%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}
@@ -25,14 +31,14 @@ Version: %{version}
 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
 
 Vendor: MadWifi
 Packager: PlanetLab <devel@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Requires: coreutils
 
@@ -40,14 +46,11 @@ Requires: coreutils
 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
 
@@ -90,6 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 /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*