X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=iptables.spec;h=99aca2ee4906b36b2b1290ed97dd47c846dae3b0;hb=9eadba894a15cd5c7d4047d0f2fbd8372b385a90;hp=efaaf2a7c16e56d09f6276690d47412b3e0bcc7a;hpb=7972c188cba564a368cd884c3cff40de3f5e4df2;p=iptables.git

diff --git a/iptables.spec b/iptables.spec
index efaaf2a..99aca2e 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,6 +1,6 @@
 %define name iptables
 %define version 1.4.10
-%define taglevel 2
+%define taglevel 4
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -14,6 +14,7 @@ Name: %{name}
 Version: %{version}
 Release: %{release}
 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
+Source: http://ipset.netfilter.org/ipset-4.5.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
 Source3: planetlab-config
@@ -119,7 +120,7 @@ rm -rf %{buildroot}
 /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 
-service iptables restart
+[ "$PL_BOOTCD" = "1" ] || service iptables restart
 
 %postun -p /sbin/ldconfig
 
@@ -140,8 +141,8 @@ fi
 %defattr(-,root,root)
 %doc COPYING INSTALL INCOMPATIBILITIES
 %attr(0755,root,root) /etc/rc.d/init.d/iptables
-%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
-%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables
+%config %attr(0600,root,root) /etc/sysconfig/iptables-config
+%config %attr(0600,root,root) /etc/sysconfig/iptables
 /sbin/iptables*
 /bin/iptables-xml
 %{_mandir}/man8/iptables*
@@ -180,6 +181,12 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Thu Mar 24 2011 S.Çağlar Onur <caglar@verivue.com> - iptables-1.4.10-4
+- Don't start iptables service on build time
+
+* Wed Feb 23 2011 S.Çağlar Onur <caglar@verivue.com> - iptables-1.4.10-3
+- Remove ugly hack for config files
+
 * Thu Jan 27 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - iptables-1.4.10-2
 - Fix the patch