Setting tag ipfw-20120610-1

integrated ipfw3 as of 20120610 from upstream

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 12e5b7c..219b76f 100644 (file)
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -15,7 +15,7 @@
 # this release was pulled from http://info.iet.unipi.it/~marta/dummynet/ipfw3-20120610.tar.gz
 %define name ipfwroot
 %define version 20120610
-%define taglevel 0
+%define taglevel 1
 
 # when no planetlab kernel is being built, kernel_version is defined but empty
 %define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
@@ -114,6 +114,9 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* 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
 

diff --git a/planetlab/ipfwslice.spec b/planetlab/ipfwslice.spec
index 6512d92..7aa5934 100644 (file)
--- a/planetlab/ipfwslice.spec
+++ b/planetlab/ipfwslice.spec
@@ -11,7 +11,7 @@
 # this release was pulled from http://info.iet.unipi.it/~marta/dummynet/ipfw3-20120610.tar.gz
 %define name ipfwslice
 %define version 20120610
-%define taglevel 0
+%define taglevel 1
 
 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ipfw.8*
 
 %changelog
+* 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