X-Git-Url: http://git.onelab.eu/?p=ipfw.git;a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=86bce6a88b50e7aeb83f1b417d445bec2dd48ecb;hp=e0472fc1346af0fc59fbc03f3694ec5a27c55de1;hb=HEAD;hpb=6392844f470e985b8a89e0405a54d9991deb9045

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index e0472fc..86bce6a 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -1,4 +1,7 @@
 #
+# This repository is obsolete - please see instead
+# git://git.code.sf.net/p/dummynet/code@master
+#
 # Marta Carbone <marta.carbone@iet.unipi.it>
 # 2009 - Universita` di Pisa
 # License is BSD.
@@ -12,9 +15,11 @@
 # kernel_version : 2.6.27.57 | 2.6.32  (57 in the 27 case is the patch level)
 # 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}
@@ -58,6 +63,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
@@ -113,6 +119,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