Setting tag madwifi-4132-6

[madwifi.git] / madwifi.spec

diff --git a/madwifi.spec b/madwifi.spec
index 6d234c4..7eb95de 100644 (file)
--- a/madwifi.spec
+++ b/madwifi.spec
@@ -1,7 +1,17 @@
 # Marc E. Fiuczynski <mef@cs.princeton.edu>
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
 # Copyright (C) 2006 The Trustees of Princeton University
 # License is GPL.
 
+# NOTE.
+# This specfile has additions so it can build against a stock-fedora kernel
+# (see the section that defines 'percent' below)
+# However this is not used, since we use the stock fedora kernel starting with f16
+# which provides for the atheros drivers as part of the kernel rpm already
+# also, the release of madwifi for which this addition was made (20100921)
+# does not seem to build against the stock fedora kernel anyway
+# 
+#
 # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
 # 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)
@@ -9,14 +19,32 @@
 
 %define name madwifi
 %define version 4132
-%define taglevel 3
+%define taglevel 6
 
 %define actual_name %{name}-trunk-r%{version}-20100921
 
+# 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 release %{kernel_version}.%{pl_kernel_taglevel}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%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}
@@ -26,7 +54,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
@@ -44,6 +72,7 @@ Packager: PlanetLab <devel@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
 URL: %{SCMURL}
 
+Requires: kernel = %{kernel_version}-%{kernel_release}
 Requires: coreutils
 
 %description
@@ -130,6 +159,16 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %changelog
+* Tue Sep 04 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-4132-6
+- can build against a stock fedora kernel
+- turned out useless as fedora16 has these drivers natively
+
+* 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