X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=17ba52b046905ea1a3dbd441a78f5fd1c0789aa1;hb=1962648f7ea7ff7e6aa75437f9f549a0eef56a6b;hp=bb859610e6215fd61f185645db3f7854dab2e0b2;hpb=da0fb5e4fc7747e96b5cf5925c7582ac6345b984;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index bb85961..17ba52b 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,29 +1,33 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 # 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 0
+%define taglevel 4
 
 %define actual_name %{name}-trunk-r%{version}-20100921
 
-%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-# use any of these two if found
+# 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}
 %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 extra star should address the -i686 part, that k27 does not have
-%define kernel_id %{kernel_version}-%{kernel_release}*
+# 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}.%{kernel_arch}
+%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: madwifi Atheros driver
 Name: %{name}
@@ -38,7 +42,7 @@ 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
 
@@ -51,10 +55,6 @@ madwifi is a new generation driver for the Atheros chipset
 %build
 rm -rf $RPM_BUILD_ROOT
 
-# with the new build, we use the kernel-devel rpm for building
-# 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
 
@@ -130,6 +130,15 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Mon Oct 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-4
+- for building against k32 on f8
+
+* 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
+
 * Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-0.9.4-2
 - specfile adjustments for 0.9.4