X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=bb859610e6215fd61f185645db3f7854dab2e0b2;hb=da0fb5e4fc7747e96b5cf5925c7582ac6345b984;hp=0517f2b4ddf49c478f8405be3e0b3ec2cb1158be;hpb=06fd947096ae6894b7207053baca84b718d192ce;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 0517f2b..bb85961 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,25 +1,29 @@
 #
-# madwifi spec file
-#
-# RPM spec file
+# $Id$
 #
+%define url $URL$
+
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 # License is GPL.
-#
-# $Id$
-#
 
 # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
 # kernel_release : vs2.3.0.29.1.planetlab
 # kernel_version : 2.6.22.14
 
 %define name madwifi
-%define version 0.9.3.3
+%define version 4132
+%define taglevel 0
 
-%define release %{kernel_version}.1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
-%define kernel_id %{kernel_version}-%{kernel_release}
+%define actual_name %{name}-trunk-r%{version}-20100921
+
+%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+# use any of these two if found
+%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch}
+%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch}
+# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686
+# the extra star should address the -i686 part, that k27 does not have
+%define kernel_id %{kernel_version}-%{kernel_release}*
 
 Summary: madwifi Atheros driver
 Name: %{name}
@@ -27,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 4.2
-URL: http://sourceforge.net/projects/madwifi/
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Requires: coreutils
 
@@ -42,13 +46,14 @@ 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}
+# guess which convention is used; k27 and before used dash, k32 uses dot
+%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} )
 
 %__make KERNELPATH=%kernelpath clean
 %__make KERNELPATH=%kernelpath
@@ -81,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 /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
@@ -89,7 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 /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*
@@ -98,6 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/athkey.8*
 %{_mandir}/man8/athstats.8*
 %{_mandir}/man8/wlanconfig.8*
+%{_mandir}/man8/ath_info.8*
 
 
 %post
@@ -120,6 +130,9 @@ if [ $1 -eq 0 ] ; then
 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