X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirewall-init.git;a=blobdiff_plain;f=firewall-init.spec;h=389aa65b6795345f7ad5164ee318e80b56438e4b;hp=347a023b3cc1bad346d1c96d7ce8df2089de1e39;hb=HEAD;hpb=ee1ebcac30201c26b0e5ef1b008c3e0f324962df

diff --git a/firewall-init.spec b/firewall-init.spec
index 347a023..389aa65 100644
--- a/firewall-init.spec
+++ b/firewall-init.spec
@@ -1,34 +1,31 @@
 Summary:	Firewall SysV-init style start-up script
-Summary(pl):	Skrypt startowy firewalla
+Summary(pl.UTF-8):	Skrypt startowy firewalla
 Name:		firewall-init
-Version:	2.99.5
-Release:	2@2.4
+Version:	2.99.11
+Release:	1
 License:	GPL
 Group:		Networking/Admin
-Group(de):	Netzwerkwesen/Administration
-Group(pl):	Sieciowe/Administacyjne
-# Source0:	ftp://ftp.pld.org.pl/software/firewall-init/%{name}-%{version}.tar.gz
-# Source0-md5:	e336e02377ef26c258d8ccabeaefcf8c
-Source0:        http://aramin.one.pl/~undefine/%{name}-%{version}.tar.gz
-Patch0:		%{name}-pre.patch
-PreReq:		rc-scripts
+Source0:	ftp://ftp.pld-linux.org/software/firewall-init/%{name}-%{version}.tar.bz2
+# Source0-md5:	8a57d9efb9df6f46b4665c55d0a9450f
+BuildRequires:	rpmbuild(macros) >= 1.194
 Requires(post,preun):	/sbin/chkconfig
+Requires:	coreutils
 Requires:	iptables >= 1.2.2-2
-Conflicts:	kernel < 2.3.0
+Requires:	rc-scripts
+Obsoletes:	iptables-init
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Firewall-init is meant to provide an easy to use interface for starting
-and stopping the kernel IP packet filter through iptables(8).
+Firewall-init is meant to provide an easy to use interface for
+starting and stopping the kernel IP packet filter through iptables(8).
 
-%description -l pl
-Dziêki firewall-init uzyskuje siê ³atwy interfejs do startowania i
-stopowania filtrów IP j±dra poprzez iptables(8).
+%description -l pl.UTF-8
+Dzięki firewall-init uzyskuje się łatwy interfejs do startowania i
+stopowania filtrów IP jądra poprzez iptables(8).
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,11 +36,17 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- %{name} < 2.5
+%banner -e %{name} <<'EOF'
+You need to manually convert your rules to iptables or install
+firewall-init-ipchains
+EOF
+
 %post
 /sbin/chkconfig --add firewall
 /sbin/chkconfig --add firewall-pre
 
-%postun
+%preun
 if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del firewall
 	/sbin/chkconfig --del firewall-pre
@@ -51,11 +54,11 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README ChangeLog
 %defattr(640,root,root,750)
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/ip*
-%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/functions.rules
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall.d/ip*
+%verify(not md5 mtime size) %config(noreplace) /etc/sysconfig/firewall.d/functions.rules
 /etc/sysconfig/firewall.d/functions
 %attr(754,root,root) /etc/rc.d/init.d/firewall*
 %dir /etc/sysconfig/firewall.d