X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=d090b5edc08ce38f50df90f417f94870e244f265;hb=41fb724e072f47b0adb7ace77a0f32cd67d22f7d;hp=3e62c1561facd92e1a534db8de7ac5d5417f6260;hpb=811ce47697255ee7f88db56cbc6451aac2365b55;p=ipfw.git

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 3e62c15..d090b5e 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -13,9 +13,10 @@
 # kernel_arch :    i686 | x86_64
 
 # this release was pulled from http://info.iet.unipi.it/~marta/dummynet/ipfw3-20120610.tar.gz
+# seel also          http://sourceforge.net/p/dummynet/code
 %define name ipfwroot
 %define version 20120610
-%define taglevel 1
+%define taglevel 2
 
 # when no planetlab kernel is being built, kernel_version is defined but empty
 %define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
@@ -59,6 +60,7 @@ License: BSD
 Group: System Environment/Kernel
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: kernel = %{kernel_version}-%{kernel_release}
 Requires: vixie-cron
 Requires: vsys-scripts
 Obsoletes: ipfw
@@ -114,6 +116,12 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-20120610-2
+- cosmetic changes only in specfile
+
+* Fri Jun 15 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-20120610-1
+- integrated ipfw3 as of 20120610 from upstream
+
 * Mon Oct 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-23
 - for building against k32 on f8