- add cron for sa-update

- drop some todo after small discuss with radek
- drop -tools (contents moved to main pkg)

Changed files:
    spamassassin.spec -> 1.131

diff --git a/spamassassin.spec b/spamassassin.spec
index 9b53a835efe9fcaf3f6a8452beec1e5e2eda28e2..415fe272682121af0c8cf5ef694cd87b6d77c9d0 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -1,9 +1,5 @@
 # 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"
@@ -25,6 +21,8 @@ Source1:      %{name}.sysconfig
 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
@@ -60,6 +58,7 @@ BUildRequires:        perl-Compress-Zlib
 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)
@@ -102,20 +101,6 @@ INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc
 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
@@ -278,7 +263,7 @@ rm -f compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps/body_0/.pack
 
 %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
@@ -287,6 +272,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/spamd
 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}}
@@ -321,7 +308,7 @@ fi
 %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
@@ -331,10 +318,6 @@ fi
 %{_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*
@@ -373,7 +356,9 @@ fi
 %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*