X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=filtergen.spec;h=a40f3c0fcd6ac6c1edb8974ae54b7d3b38b31e75;hb=53e4f21ef4590dc415a27d23233becb544c582db;hp=5bc32b976394936b94499dd91567cdcd8bdd8fd1;hpb=3fbde289478ab58b675fc322a219b833865427a5;p=packages%2Ffiltergen.git

diff --git a/filtergen.spec b/filtergen.spec
index 5bc32b9..a40f3c0 100644
--- a/filtergen.spec
+++ b/filtergen.spec
@@ -1,20 +1,22 @@
 Summary:	Simple packet filter generator
 Summary(pl):	Prosty generator filtrów pakietów
-Name:		filter
-Version:	0.9
-Release:	3
+Name:		filtergen
+Version:	0.11
+Release:	1
 License:	GPL
 Group:		Networking/Utilities
 Source0:	http://hairy.beasts.org/filter/%{name}-%{version}.tar.gz
-Source1:	%{name}.conf
-Source2:	%{name}.sysconfig
-Source3:	%{name}.init
-Patch0:		%{name}-types.patch
+# Source0-md5:	de33c1dce928fe240b036498e56e545f
+Source1:	filter.conf
+Source2:	filter.sysconfig
+Source3:	filter.init
 URL:		http://hairy.beasts.org/filter/
 BuildRequires:	flex
-Prereq:		rc-scripts
-Prereq:		/sbin/chkconfig
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
 Provides:	firewall
+Obsoletes:	filter
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,56 +48,49 @@ Przeczytaj plik HONESTY!
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -Wall -Werror"
+	CFLAGS="%{rpmcflags} -Wall -Werror -Wno-unused"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/%{name}} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{sysconfig,rc.d/init.d} \
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/filter} \
+	$RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d} \
 	$RPM_BUILD_ROOT%{_mandir}/man{5,7,8}
 
 install filtergen $RPM_BUILD_ROOT%{_sbindir}
 install filter_syntax.5 $RPM_BUILD_ROOT%{_mandir}/man5
 install filter_backends.7 $RPM_BUILD_ROOT%{_mandir}/man7
 install filtergen.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/simple.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}
-touch $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/generated_rules
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/filter/simple.conf
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/filter/generated_rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add filter
-if [ -f /var/lock/subsys/filter ]; then
-        /etc/rc.d/init.d/filter restart >&2
-else
-        echo "Run \"/etc/rc.d/init.d/filter start\" to start filter"
-fi
+/sbin/chkconfig --add filtergen
+%service filtergen restart "filtergen"
 
 %preun
 if [ "$1" = "0" ]; then
-        if [ -f /var/lock/subsys/filter ]; then
-                /etc/rc.d/init.d/filter stop >&2
-        fi
-        /sbin/chkconfig --del filter
+	%service filtergen stop
+	/sbin/chkconfig --del filtergen
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README HONESTY HISTORY TODO tests
 %attr(755,root,root) %{_sbindir}/filtergen
-%dir %{_sysconfdir}/%{name}
-%attr(600,root,root) %{_sysconfdir}/%{name}/simple.conf
-%attr(600,root,root) %{_sysconfdir}/%{name}/generated_rules
-%attr(600,root,root) %{_sysconfdir}/sysconfig/%{name}
-%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/%{name}
+%dir %{_sysconfdir}/filter
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/filter/simple.conf
+%attr(600,root,root) %{_sysconfdir}/filter/generated_rules
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*