Added a conflict with the old package name.

[ipfw.git] / planetlab / ipfwroot.spec

diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec
index 30da96e..5e82009 100644 (file)
--- a/planetlab/ipfwroot.spec
+++ b/planetlab/ipfwroot.spec
@@ -16,7 +16,7 @@
 
 %define name ipfwroot
 %define version 0.9
-%define taglevel 11
+%define taglevel 13
 
 %define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
@@ -32,6 +32,7 @@ Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: vixie-cron
 Requires: vsys-scripts
+Conflicts: ipfw
 
 Vendor: unipi
 Packager: PlanetLab <marta@onelab2.iet.unipi.it>
@@ -87,6 +88,9 @@ depmod -a
 /etc/rc.d/init.d/ipfw
 
 %changelog
+* Tue Apr 27 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-13
+- Update to the ipfw3 version of the dummynet code.
+
 * Mon Apr 12 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ipfw-0.9-11
 - add ipfw initialization script to chkconfig