- drop upstart support

- rel 4

diff --git a/ip6tables.upstart b/ip6tables.upstart
deleted file mode 100644 (file)
index 6b885e9..0000000
--- a/ip6tables.upstart
+++ /dev/null
@@ -1,19 +0,0 @@
-description "Load /etc/sysconfig/iptables pre-defined rules"
-
-start on pld.network-started
-stop on pld.network-stopped
-
-env IPTABLES_CONFIG=/etc/sysconfig/ip6tables
-
-pre-start script
-       # fail early if config missing
-       test -f $IPTABLES_CONFIG || /sbin/initctl stop
-end script
-
-script
-       exec /etc/rc.d/init.d/iptables6 load
-end script
-
-pre-stop script
-       exec /etc/rc.d/init.d/iptables6 clear
-end script

diff --git a/iptables.spec b/iptables.spec
index 38add2f116fc526fe38d250ace3e3a83b8b921a0..137abc7b901a7850b1d576cf058387826950745c 100644 (file)
--- a/iptables.spec
+++ b/iptables.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):    Утиліти для керування пакетними 
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          iptables
 Version:       1.4.21
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Networking/Admin
 Source0:       ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -42,8 +42,6 @@ Source1:      cvs://cvs.samba.org/netfilter/%{name}-howtos.tar.bz2
 # Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
 Source2:       %{name}.init
 Source3:       %{name6}.init
-Source4:       %{name}.upstart
-Source5:       %{name6}.upstart
 Source6:       %{name}-config
 Source7:       %{name6}-config
 Source8:       %{name}.service
@@ -250,9 +248,6 @@ cp -p libiptc/libiptc.ld $RPM_BUILD_ROOT%{_libdir}/libiptc.so
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name6}
-install -d $RPM_BUILD_ROOT/etc/init
-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/%{name6}.conf
 
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-config
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/%{name6}-config
@@ -480,7 +475,5 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name6}-config
 %attr(754,root,root) /etc/rc.d/init.d/iptables
 %attr(754,root,root) /etc/rc.d/init.d/ip6tables
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
-%config(noreplace) %verify(not md5 mtime size) /etc/init/%{name6}.conf
 %{systemdunitdir}/%{name}.service
 %{systemdunitdir}/%{name6}.service

diff --git a/iptables.upstart b/iptables.upstart
deleted file mode 100644 (file)
index 0e9c07a..0000000
--- a/iptables.upstart
+++ /dev/null
@@ -1,19 +0,0 @@
-description "Load /etc/sysconfig/iptables pre-defined rules"
-
-start on pld.network-started
-stop on pld.network-stopped
-
-env IPTABLES_CONFIG=/etc/sysconfig/iptables
-
-pre-start script
-       # fail early if config missing
-       test -f $IPTABLES_CONFIG || /sbin/initctl stop
-end script
-
-script
-       exec /etc/rc.d/init.d/iptables load
-end script
-
-pre-stop script
-       exec /etc/rc.d/init.d/iptables clear
-end script