#
-# 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 3878
+%define taglevel 0
+
+%define actual_name %{name}-trunk-r%{version}-20081204
-%define release %{kernel_version}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%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}
Release: %{release}
License: GPL
Group: System Environment/Kernel
-Source0: %{name}-%{version}.tar.bz2
+Source0: %{actual_name}.tar.bz2
+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
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
-linux=/usr/src/kernels/%{kernel_id_arch}
+%define kernelpath /usr/src/kernels/%{kernel_id_arch}
-%__make KERNELPATH=$linux clean
-%__make KERNELPATH=$linux
-echo 'r' | %__make KERNELPATH=$linux DESTDIR=$RPM_BUILD_ROOT install
+%__make KERNELPATH=%kernelpath clean
+%__make KERNELPATH=%kernelpath
%install
+rm -fr $RPM_BUILD_ROOT
+
+echo 'r' | %__make KERNELPATH=%kernelpath BINDIR=/sbin MANDIR=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install
+install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/ifup-pre-local
+
# Remove depmod files, will be regenerated in %post
rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/modules.*
/lib/modules/%{kernel_id}/net/wlan_tkip.ko
/lib/modules/%{kernel_id}/net/wlan_wep.ko
/lib/modules/%{kernel_id}/net/wlan_xauth.ko
-/usr/local/bin/80211debug
-/usr/local/bin/80211stats
-/usr/local/bin/athchans
-/usr/local/bin/athctrl
-/usr/local/bin/athdebug
-/usr/local/bin/athkey
-/usr/local/bin/athstats
-/usr/local/bin/wlanconfig
-/usr/local/man/man8/80211debug.8
-/usr/local/man/man8/80211stats.8
-/usr/local/man/man8/athchans.8
-/usr/local/man/man8/athctrl.8
-/usr/local/man/man8/athdebug.8
-/usr/local/man/man8/athkey.8
-/usr/local/man/man8/athstats.8
-/usr/local/man/man8/wlanconfig.8
+/lib/modules/%{kernel_id}/net/ath_rate_minstrel.ko
+/sbin/80211debug
+/sbin/80211stats
+/sbin/athchans
+/sbin/athctrl
+/sbin/athdebug
+/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/athctrl.8*
+%{_mandir}/man8/athdebug.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