X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=madwifi.spec;h=7e5122ec450f9a62beac669d88611dec1c4e4db2;hb=59b13c918e8b1c67fb7e5208ad3c42e272a7cea9;hp=5c6066ec132e07d57571d7626b39615002ea3d93;hpb=d559f056f6995a4970c856c08751fa06c662f05a;p=madwifi.git

diff --git a/madwifi.spec b/madwifi.spec
index 5c6066e..7e5122e 100644
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,23 +1,40 @@
-#
-# $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 1
+%define taglevel 5
 
 %define actual_name %{name}-trunk-r%{version}-20100921
 
-%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+# when no planetlab kernel is being built, kernel_version is defined but empty
+%define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
+# we need to make sure that this rpm gets upgraded when the kernel release changes
+%if %{_with_planetlab_kernel}
+# with the planetlab kernel
+%define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 )
+%define madwifi_release %{kernel_version}.%{pl_kernel_taglevel}
+%else
+# with the stock kernel
+# this line below
+#%define madwifi_release %( rpm -q --qf "%{version}" kernel-headers )
+# causes recursive macro definition no matter how much you quote
+%define percent %
+%define braop \{
+%define bracl \}
+%define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-headers )
+%define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-headers )
+%define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-headers )
+%define madwifi_release %{kernel_version}.%{kernel_release}
+%endif
+
+%define release %{madwifi_release}.%{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}
@@ -27,7 +44,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
@@ -43,8 +60,9 @@ 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: kernel = %{kernel_version}-%{kernel_release}
 Requires: coreutils
 
 %description
@@ -131,6 +149,18 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Mon Jan 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-5
+- search third-party in dual location
+
+* 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