X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=40cff6015591a3cdc56378967f9b8dabbb463072;hb=525efe389b7cf649d6243e085abb6c58ec913ace;hp=ac0bcb4658317475205ca8cdd910dea0240d41f4;hpb=8decbf02f7ef7d85f7673fbb649022bbe80940ee;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index ac0bcb4..40cff60 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -1,6 +1,4 @@
 #
-# $Id: ipfwroot.spec 16174 2009-12-15 13:38:15Z marta $
-#
 # TODO:
 # restart crond
 #
@@ -16,7 +14,7 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 18
+%define taglevel 21
 
 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -28,7 +26,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}.%{_target_cpu}
 %define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: ipfw and dummynet for Linux
@@ -94,6 +92,15 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-21
+- build tweaks for gcc-4.6 on f15
+
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-20
+- tweaks for compiling on k32/64 bits
+
+* Wed Dec 08 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-19
+- fix detection of kernel conventions
+
 * Tue Dec 07 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-18
 - guess conventions for either <=k27 or >=k32