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

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 31a17e2..86bce6a 100644
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -1,22 +1,48 @@
 #
-# TODO:
-# restart crond
+# This repository is obsolete - please see instead
+# git://git.code.sf.net/p/dummynet/code@master
 #
-%define url $URL$
-
 # Marta Carbone <marta.carbone@iet.unipi.it>
 # 2009 - Universita` di Pisa
 # License is BSD.
 
+#
+# xxx: TODO restart crond
+#
+
 # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
-# kernel_release : vs2.3.0.29.1.planetlab
-# kernel_version : 2.6.22.14
+# kernel_release : 24.onelab  (24 is then the planetlab taglevel)
+# 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 0.9
-%define taglevel 20
-
-%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 20120610
+%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}
+# we need to make sure that this rpm gets upgraded when the kernel release changes
+%if %{_with_planetlab_kernel}
+# with the planetlab kernel
+%define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 )
+%define ipfw_release %{kernel_version}.%{pl_kernel_taglevel}
+%else
+# with the stock kernel
+# this line below
+#%define ipfw_release %( rpm -q --qf "%{version}" kernel-headers )
+# causes recursive macro definition no matter how much you quote
+%define percent %
+%define braop \{
+%define bracl \}
+%define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-headers )
+%define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-headers )
+%define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-headers )
+%define ipfw_release %{kernel_version}.%{kernel_release}
+%endif
+
+%define release %{ipfw_release}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 # guess which convention is used; k27 and before used dash, k32 uses dot
 %define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch}
@@ -26,7 +52,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}.%{kernel_arch}
 %define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} )
 
 Summary: ipfw and dummynet for Linux
@@ -37,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
@@ -45,7 +72,7 @@ Vendor: unipi
 Packager: PlanetLab <marta@onelab2.iet.unipi.it>
 # XXX ask 
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 %description
 ipfw is the Linux port of the FreeBSD ipfw and dummynet packages
@@ -92,6 +119,21 @@ 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
+
+* Sun Oct 02 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-22
+- rpm version number has the kernel taglevel embedded
+
+* 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