Merge branch 'master' of ssh://git.onelab.eu/git/ipfw

[ipfw.git] / planetlab / ipfwroot.spec

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index dac5e82..51c1b32 100644 (file)
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -14,7 +14,7 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 21
+%define taglevel 22
 
 # 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 )
@@ -29,7 +29,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: ipfw and dummynet for Linux
@@ -95,6 +95,9 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Sun Oct 02 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-22
+- rpm version number has the kernel taglevel embedded
+
 * Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-21
 - build tweaks for gcc-4.6 on f15