-#
-# $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 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}
# 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}.%{_target_cpu}
%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
Summary: madwifi Atheros driver
Vendor: MadWifi
Packager: PlanetLab <devel@planet-lab.org>
Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
Requires: coreutils
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
+
* Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - madwifi-0.9.4-2
- specfile adjustments for 0.9.4