X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=95da4566b797ad76442c260240c57e52aea9bfe7;hb=0c6adf2c9e36b8c87f56a38b2381bfd3c127a647;hp=0bd32758ba959e5bb5e366e269f25a2ba0ce22de;hpb=72f2f16dd4a04a66b454ede13c2c61d30e39a4a3;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 0bd3275..95da456 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -3,16 +3,20 @@
 # License is GPL.
 
 # 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
+# kernel_release : 24.onelab  (24 is then the planetlab taglevel)
+# kernel_version : 2.6.27.57 | 2.6.32  (57 in the 27 case is the patch level)
+# kernel_arch :    i686 | x86_64
 
 %define name madwifi
 %define version 4132
-%define taglevel 2
+%define taglevel 3
 
 %define actual_name %{name}-trunk-r%{version}-20100921
 
-%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+# we need to make sure that this rpm gets upgraded when the kernel release changes
+%define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 )
+
+%define release %{kernel_version}.%{pl_kernel_taglevel}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 # 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}
@@ -22,7 +26,7 @@
 # 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_new %{kernel_version}-%{kernel_release}.%{kernel_arch}
 %define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: madwifi Atheros driver
@@ -126,6 +130,9 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Sun Oct 02 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-3
+- rpm version number has the kernel taglevel embedded
+
 * Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-2
 - build tweaked for k32