SPECS: spamassassin.spec - add cron for sa-update - drop some todo...

[glen]

Author: glen                         Date: Mon Jun 18 08:31:24 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add cron for sa-update
- drop some todo after small discuss with radek
- drop -tools (contents moved to main pkg)

---- Files affected:
SPECS:
   spamassassin.spec (1.130 -> 1.131) 

---- Diffs:

================================================================
Index: SPECS/spamassassin.spec
diff -u SPECS/spamassassin.spec:1.130 SPECS/spamassassin.spec:1.131
--- SPECS/spamassassin.spec:1.130	Sat Jun 16 16:23:18 2007
+++ SPECS/spamassassin.spec	Mon Jun 18 10:31:19 2007
@@ -1,10 +1,6 @@
 # $Revision$, $Date$
 # TODO
 # - build lib{,ssl}spamc.so (if there is a point)
-# - kill "update" subpackage and move it to perl-Mail-SpamAssassin?
-#   it's `strongly recommended' in 3.2.0 (instead of `optional').
-# - is it possible to package compiled results in -compile or the result is
-#   site/machine dependant?
 #
 # Conditional build:
 %bcond_without	tests		# do not perform "make test"
@@ -26,6 +22,8 @@
 Source2:	%{name}-spamd.init
 Source3:	%{name}-default.rc
 Source4:	%{name}-spamc.rc
+Source5:	sa-update.sh
+Source6:	sa-update.cron
 URL:		http://spamassassin.apache.org/
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl(ExtUtils::MakeMaker) >= 6.16
@@ -61,6 +59,7 @@
 BuildRequires:	rpm-perlprov >= 4.1-13
 Requires:	perl-Mail-SpamAssassin = %{version}-%{release}
 Obsoletes:	SpamAssassin
+Obsoletes:	spamassassin-tools
 Suggests:	spamassassin-update
 Suggests:	spamassassin-compile
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -103,20 +102,6 @@
 Aby filtrować spam dla wszystkich użytkowników, należy dodać tę linię
 do pliku /etc/procmailrc (tworząc go w razie potrzeby).
 
-%package tools
-Summary:	Miscleanous tools for SpamAssassin
-Summary(pl.UTF-8):	Przeróżne narzędzia związane z SpamAssassin
-Group:		Applications/Mail
-Obsoletes:	SpamAssassin-tools
-
-%description tools
-Miscleanous tools from various authors, distributed with SpamAssassin.
-See /usr/share/doc/spamassassin-tools-*/.
-
-%description tools -l pl.UTF-8
-Przeróżne narzędzia, dystrybuowane razem ze SpamAssassinem. Więcej
-informacji w /usr/share/doc/spamassassin-tools-*/.
-
 %package spamd
 Summary:	spamd - daemonized version of spamassassin
 Summary(pl.UTF-8):	spamd - spamassassin w postaci demona
@@ -279,7 +264,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},%{_sysconfdir}/mail/spamassassin}
+install -d $RPM_BUILD_ROOT{/etc/{cron.d,sysconfig,rc.d/init.d},%{_sysconfdir}/mail/spamassassin}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -288,6 +273,8 @@
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamd
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin
 install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/spamassassin/sa-update.cron
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update
 
 # sa-update, sa-compile
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
@@ -322,7 +309,7 @@
 %files
 %defattr(644,root,root,755)
 %doc CREDITS Changes INSTALL README TRADEMARK UPGRADE USAGE
-%doc procmailrc.example
+%doc procmailrc.example sql/ ldap/
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/spamassassin-default.rc
 %attr(755,root,root) %{_bindir}/sa-learn
 %attr(755,root,root) %{_bindir}/spamassassin
@@ -332,10 +319,6 @@
 %{_mandir}/man1/sa-learn*
 %{_mandir}/man1/spamassassin*
 
-%files tools
-%defattr(644,root,root,755)
-%doc sql ldap
-
 %files spamd
 %defattr(644,root,root,755)
 %doc spamd/README*
@@ -374,7 +357,9 @@
 %defattr(644,root,root,755)
 %attr(700,root,root) %dir %{_sysconfdir}/mail/spamassassin/sa-update-keys
 %attr(700,root,root) %ghost %{_sysconfdir}/mail/spamassassin/sa-update-keys/*
+%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/sa-update
 %attr(755,root,root) %{_bindir}/sa-update
+%{_datadir}/spamassassin/sa-update.cron
 %{_datadir}/spamassassin/sa-update-pubkey.txt
 %dir /var/lib/spamassassin/%{sa_version}
 %{_mandir}/man1/sa-update*
@@ -402,6 +387,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2007/06/18 08:31:19  glen
+- add cron for sa-update
+- drop some todo after small discuss with radek
+- drop -tools (contents moved to main pkg)
+
 Revision 1.130  2007/06/16 14:23:18  qboosh
 - updated pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/spamassassin.spec?r1=1.130&r2=1.131&f=u