[packages/cleanfeed] - enhanced conf patch: provide sane paths in cleanfeed.local - release 3

[qboosh]

commit 9a9d588a79d6bb6f81537ebc58b8c9480713be00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 15 18:43:36 2013 +0200

    - enhanced conf patch: provide sane paths in cleanfeed.local
    - release 3

 cleanfeed-conf.patch | 21 +++++++++++++++++++++
 cleanfeed.spec       | 28 ++++++++++++++++------------
 2 files changed, 37 insertions(+), 12 deletions(-)
---
diff --git a/cleanfeed.spec b/cleanfeed.spec
index e6f88b8..10fd1d9 100644
--- a/cleanfeed.spec
+++ b/cleanfeed.spec
@@ -1,19 +1,18 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	INN spam filter
-Summary(pl.UTF-8):	Filtr spamu dla INN
+Summary(pl.UTF-8):	Filtr spamu dla INN-a
 Name:		cleanfeed
-%define		_srcver	20020501
-%define		_ver	20080809
-Version:	%{_ver}
-Release:	2
+%define		src_ver	20020501
+Version:	20080809
+Release:	3
 License:	Artistic License 2.0
 Group:		Networking/Daemons
-Source0:	http://www.bofh.it/~md/cleanfeed/%{name}-%{_srcver}.tgz
+Source0:	http://www.bofh.it/~md/cleanfeed/%{name}-%{src_ver}.tgz
 # Source0-md5:	8535cc55d63a1932a447d09829b6aa97
 Source1:	%{name}.8
 # http://groups.google.pl/group/news.software.nntp/msg/e652742ab7ff0f0a
 # http://www.mixmin.net/cleanfeed.diff
-Patch0:		%{name}-%{_ver}.diff
+Patch0:		%{name}-%{version}.diff
 Patch1:		%{name}-conf.patch
 URL:		http://www.bofh.it/~md/cleanfeed/
 BuildRequires:	rpm-perlprov
@@ -29,10 +28,11 @@ Cleanfeed is an automatic filter for INN that removes spam from
 incoming newsfeeds.
 
 %description -l pl.UTF-8
-Automatyczny filtr spamu dla serwerów news.
+Automatyczny filtr spamu dla serwera news INN. Usuwa spam z
+przychodzących "feedów".
 
 %prep
-%setup -q -n %{name}-%{_srcver}
+%setup -q -n %{name}-%{src_ver}
 %patch0 -p7
 %patch1 -p1
 
@@ -48,7 +48,7 @@ install bad_adult_paths bad_hosts bad_cancel_paths bad_paths $RPM_BUILD_ROOT%{_s
 install cleanfeed.local.sample $RPM_BUILD_ROOT%{_sysconfdir}/cleanfeed.local
 
 install cleanfeed $RPM_BUILD_ROOT%{_datadir}/news/filter/filter_innd.pl
-install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man8
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +56,10 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGES HACKING README TODO cleanfeed.local.sample-it highwind.pl tools
-%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bad_adult_paths
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bad_cancel_paths
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bad_hosts
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bad_paths
+%attr(640,root,news) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cleanfeed.local
 %{_datadir}/news/filter/filter_innd.pl
-%{_mandir}/man8/*
+%{_mandir}/man8/cleanfeed.8*
diff --git a/cleanfeed-conf.patch b/cleanfeed-conf.patch
index a67bdd5..8743eea 100644
--- a/cleanfeed-conf.patch
+++ b/cleanfeed-conf.patch
@@ -9,3 +9,24 @@
  
  ##############################################################################
  # Server configuration
+--- cleanfeed-20020501/cleanfeed.local.sample.orig	2002-05-02 11:23:20.000000000 +0200
++++ cleanfeed-20020501/cleanfeed.local.sample	2013-06-15 18:07:08.720139109 +0200
+@@ -208,13 +208,13 @@
+ sub local_config {
+ 	%config_local = (
+ 		block_late_cancels => 1,
+-		active_file => '/news/db/active',
+-		statfile => '/news/log/cleanfeed.stats',
+-#		html_statfile => '/news/log/cleanfeed.stats.html',
++		active_file => '/var/lib/news/active',
++		statfile => '/var/log/news/cleanfeed.stats',
++#		html_statfile => '/var/log/news/cleanfeed.stats.html',
+ 		stats_interval => 300,
+ 		do_emp_dump => 1,
+-		emp_dump_file => '/news/tmp/empdump',
+-		debug_batch_directory => '/news/spam',
++		emp_dump_file => '/var/lib/news/tmp/empdump',
++		debug_batch_directory => '/var/lib/news/spam',
+ 	);
+ 
+ 	%config_append = (
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cleanfeed.git/commitdiff/9a9d588a79d6bb6f81537ebc58b8c9480713be00