From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Tue, 25 Jan 2011 19:47:24 +0000 (-0500)
Subject: fix conflict
X-Git-Tag: iptables-1.4.10-0
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Ftags%2Fiptables-1.4.10-0;hp=f745676a58b0ffaa0858955c894e4979f593db9a;p=iptables.git

fix conflict
---

diff --git a/iptables.spec b/iptables.spec
index aaf5d03..a12efdd 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,8 +1,3 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name iptables
 %define version 1.4.10
 %define taglevel 0
@@ -12,7 +7,7 @@
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Summary: Tools for managing Linux kernel packet filtering capabilities
 Name: %{name}
@@ -30,6 +25,7 @@ BuildRequires: libselinux-devel
 BuildRequires: kernel-headers
 Conflicts: kernel < 2.4.20
 Requires(post): chkconfig
+Requires(post): initscripts
 Requires(preun): chkconfig
 
 %description
@@ -182,6 +178,9 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - iptables-1.4.9-1
+- add requires initscripts in deps
+
 * Wed May 12 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - iptables-1.4.7-5
 - Restart iptables service after package upgrades