X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=iptables.spec;h=5479d0dbf9fd57567436f42ee5521658f16b55f7;hb=d1aa80376d2564a6e93ae090b2f9275196c35d47;hp=cc87f97131e3820cb0a726c1ff5a16d8ee3ef549;hpb=03fd643ee5bdb83ece1dff26ef0cb29e593980dc;p=iptables.git

diff --git a/iptables.spec b/iptables.spec
index cc87f97..5479d0d 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,18 +1,13 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name iptables
-%define version 1.4.8
-%define taglevel 5
+%define version 1.4.10
+%define taglevel 2
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 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
@@ -121,6 +117,10 @@ rm -rf %{buildroot}
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add iptables
+DEFAULT_IFACE=$(ip route show default | awk '/default/ {print $5}')
+sed -i -e "s;__eth;$DEFAULT_IFACE;g" /etc/sysconfig/iptables 
+mv -f /etc/rc.d/init.d/iptables.rpmsave /etc/rc.d/init.d/iptables
+mv -f /etc/sysconfig/iptables-config.rpmnew /etc/sysconfig/iptables-config
 service iptables restart
 
 %postun -p /sbin/ldconfig
@@ -182,6 +182,15 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Thu Jan 27 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - iptables-1.4.10-2
+- Fix the patch
+
+* Wed Jan 26 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - iptables-1.4.10-1
+- Fix incorrect sha1sum
+
+* 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