X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwslice.spec;h=ecdfcf909be63ba87aee4cf9ff211314bce6504f;hb=41fb724e072f47b0adb7ace77a0f32cd67d22f7d;hp=34b217cdf96129ebf62f2c1b4db372ee99a87fe8;hpb=2a8b6c544cf5ea3c84f763144c7ecfa79daea969;p=ipfw.git

diff --git a/planetlab/ipfwslice.spec b/planetlab/ipfwslice.spec
index 34b217c..ecdfcf9 100644
--- a/planetlab/ipfwslice.spec
+++ b/planetlab/ipfwslice.spec
@@ -1,23 +1,20 @@
 #
-# $Id: ipfwslice.spec 16174 2009-12-15 13:38:15Z marta $
-#
 # TODO:
 # restart crond
 # modprobe ipfw_mod.ko (depmod ?)
 #
-%define url $URL$
 
 # Marta Carbone <marta.carbone@iet.unipi.it>
 # 2009 - Universita` di Pisa
 # License is BSD.
 
+# 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 ipfwslice
-%define version 0.9
-%define taglevel 23
+%define version 20120610
+%define taglevel 2
 
-%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
-%define kernel_id %{kernel_version}-%{kernel_release}
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Summary: ipfw and dummynet for Linux
 Name: %{name}
@@ -31,7 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Vendor: unipi
 Packager: PlanetLab <marta@onelab2.iet.unipi.it>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 %description
 the frontend part of the ipfw planetlab package
@@ -56,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/ipfw.8*
 
 %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