rpms/cleanfeed/devel cleanfeed.spec,1.16,1.17

[Roman Rakus]

Author: rrakus

Update of /cvs/pkgs/rpms/cleanfeed/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26872

Modified Files:
	cleanfeed.spec 
Log Message:
Merge review changes


Index: cleanfeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cleanfeed/devel/cleanfeed.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- cleanfeed.spec	24 Jul 2009 19:03:26 -0000	1.16
+++ cleanfeed.spec	23 Jul 2010 14:58:12 -0000	1.17
@@ -1,7 +1,7 @@
-Summary: A spam filter for Usenet news servers.
+Summary: A spam filter for Usenet news servers
 Name: cleanfeed
 Version: 20020501
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Confirmed with upstream, website
 License: Artistic 2.0
 URL: http://www.bofh.it/~md/cleanfeed/
@@ -9,8 +9,7 @@ Group: System Environment/Daemons
 Source0: http://www.bofh.it/~md/cleanfeed/cleanfeed-20020501.tgz
 Patch0: cleanfeed-20020501-redhat.patch
 Patch1: cleanfeed-20020501-ro.patch
-Buildroot: %{_tmppath}/cleanfeed-root
-BuildArchitectures: noarch
+BuildArch: noarch
 
 %description
 Cleanfeed is an automatic spam filter for Usenet news servers and
@@ -28,26 +27,33 @@ news server.
 %patch0 -p1 -b .rh
 %patch1 -p1
 
+%build
+sed '1 i #!/usr/bin/perl' cleanfeed > filter_innd.pl
+
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/news
-mkdir -p $RPM_BUILD_ROOT/usr/lib/news/bin/filter
-install -m 0644 cleanfeed.local.sample $RPM_BUILD_ROOT/etc/news/cleanfeed.local
-install -m 0644 bad_* $RPM_BUILD_ROOT/etc/news/
-install -m 0750 cleanfeed \
-	$RPM_BUILD_ROOT/usr/lib/news/bin/filter/filter_innd.pl
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/news
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/news/bin/filter
+install -m 0644 cleanfeed.local.sample $RPM_BUILD_ROOT/%{_sysconfdir}/news/cleanfeed.local
+install -m 0644 bad_* $RPM_BUILD_ROOT/%{_sysconfdir}/news/
+install -m 0755 filter_innd.pl \
+	$RPM_BUILD_ROOT/%{_datadir}/news/bin/filter/filter_innd.pl
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%doc CHANGES README HACKING TODO
-%attr(-,news,news) %config(noreplace) /etc/news/cleanfeed.local
-%attr(-,news,news) %config(noreplace) /etc/news/bad_*
-%attr(755,news,news) %dir /usr/lib/news/bin/filter
-%attr(-,news,news) /usr/lib/news/bin/filter/filter_innd.pl
+%defattr(-,root,root,-)
+%doc CHANGES README HACKING TODO LICENSE
+%attr(-,news,news) %config(noreplace)  %{_sysconfdir}/news/cleanfeed.local
+%attr(-,news,news) %config(noreplace)  %{_sysconfdir}/news/bad_*
+%attr(755,news,news) %dir %{_datadir}/news/bin/filter
+%attr(-,news,news) %{_datadir}/news/bin/filter/filter_innd.pl
 
 %changelog
+* Fri Jul 23 2010 Roman Rakus <rrakus at redhat.com> - 20020501-4
+- Merge Review changes (#225645)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20020501-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild