various fixes

diff --git a/madwifi.spec b/madwifi.spec
index 81a01d6..93b50a4 100644 (file)
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -15,10 +15,11 @@
 # kernel_version : 2.6.22.14
 
 %define name madwifi
-%define version 0.9.3
-%define subversion 3
+%define version 0.9.3.3
 
-%define release %{subversion}%{kernel_release}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define release %{kernel_version}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
+%define kernel_id %{kernel_version}-%{kernel_release}
 
 Summary: madwifi Atheros driver
 Name: %{name}
@@ -26,7 +27,7 @@ Version: %{version}
 Release: %{release}
 License: GPL
 Group: System Environment/Kernel
-Source0: %{name}-%{version}.%{subversion}.tar.bz2
+Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 Vendor: MadWifi
@@ -46,8 +47,7 @@ madwifi is a new generation driver for the Atheros chipset
 rm -rf $RPM_BUILD_ROOT
 
 # with the new build, we use the kernel-devel rpm for building
-kernel_fullname=%{kernel_version}-%{kernel_release}-%{kernel_arch}
-linux=/usr/src/kernels/$kernel_fullname
+linux=/usr/src/kernels/%{kernel_id_arch}
 
 %__make KERNELPATH=$linux clean
 %__make KERNELPATH=$linux
@@ -55,27 +55,27 @@ echo 'r' | %__make KERNELPATH=$linux DESTDIR=$RPM_BUILD_ROOT install
 
 %install
 # Remove depmod files, will be regenerated in %post
-rm -f $RPM_BUILD_ROOT/lib/modules/*/modules.*
+rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/modules.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%dir /lib/modules/*
-/lib/modules/*/net/ath_hal.ko
-/lib/modules/*/net/ath_pci.ko
-/lib/modules/*/net/ath_rate_sample.ko
-/lib/modules/*/net/ath_rate_amrr.ko
-/lib/modules/*/net/ath_rate_onoe.ko
-/lib/modules/*/net/wlan.ko
-/lib/modules/*/net/wlan_acl.ko
-/lib/modules/*/net/wlan_ccmp.ko
-/lib/modules/*/net/wlan_scan_ap.ko
-/lib/modules/*/net/wlan_scan_sta.ko
-/lib/modules/*/net/wlan_tkip.ko
-/lib/modules/*/net/wlan_wep.ko
-/lib/modules/*/net/wlan_xauth.ko
+%dir /lib/modules/%{kernel_id}
+/lib/modules/%{kernel_id}/net/ath_hal.ko
+/lib/modules/%{kernel_id}/net/ath_pci.ko
+/lib/modules/%{kernel_id}/net/ath_rate_sample.ko
+/lib/modules/%{kernel_id}/net/ath_rate_amrr.ko
+/lib/modules/%{kernel_id}/net/ath_rate_onoe.ko
+/lib/modules/%{kernel_id}/net/wlan.ko
+/lib/modules/%{kernel_id}/net/wlan_acl.ko
+/lib/modules/%{kernel_id}/net/wlan_ccmp.ko
+/lib/modules/%{kernel_id}/net/wlan_scan_ap.ko
+/lib/modules/%{kernel_id}/net/wlan_scan_sta.ko
+/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
@@ -95,9 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-for version in /lib/modules/* ; do
-    depmod -a $(basename $version) >/dev/null 2>&1 || :
-done
+depmod -a %{kernel_id} >/dev/null 2>&1 || :
 
 # ask for a reboot
 
@@ -106,15 +104,13 @@ done
 %postun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
-    for dir in /lib/modules/* ; do
-       version=$(basename $dir)
-        # If we were the only module installed, remove the module dependencies
-       if [ ! -d $dir/kernel ] ; then
-           [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove $version
-       else
-           depmod -a $version >/dev/null 2>&1 || :
-       fi
-    done
+    dir=/lib/modules/%{kernel_id}
+    # If we were the only module installed, remove the module dependencies
+    if [ ! -d $dir/kernel ] ; then
+       [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{kernel_id}
+    else
+       depmod -a %{kernel_id} >/dev/null 2>&1 || :
+    fi
 fi
 
 %changelog