- fix start/stop script

[packages/spamassassin.git] / spamassassin.spec

diff --git a/spamassassin.spec b/spamassassin.spec
index 5f7280486980293792f3ca8f7fc6323657303a24..3e548f8ac28b697cc971ed6f45c6ed04137490fd 100644 (file)
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -1,6 +1,6 @@
 # TODO
 # - build lib{,ssl}spamc.so (if there is a point)
-# - sa-check_spamd into nagios-spamassassin subpackage
+# - sa-check_spamd into nagios-plugin-check_spamd subpackage
 #
 # Conditional build:
 %bcond_without tests           # do not perform "make test"
@@ -12,12 +12,12 @@
 Summary:       A spam filter for email which can be invoked from mail delivery agents
 Summary(pl.UTF-8):     Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:          spamassassin
-Version:       3.3.0
-Release:       1
+Version:       3.4.0
+Release:       2
 License:       Apache v2.0
 Group:         Applications/Mail
-Source0:       http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5: 15af629a95108bf245ab600d78ae754b
+Source0:       http://ftp.ps.pl/pub/apache//spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
+# Source0-md5: 46e99adc0affebbe5f3524b4834e0345
 Source1:       %{name}.sysconfig
 Source2:       %{name}-spamd.init
 Source3:       %{name}-default.rc
@@ -39,6 +39,7 @@ BuildRequires:        perl-IP-Country
 BuildRequires: perl-Mail-SPF-Query
 BuildRequires: perl-Net-DNS >= 0.65-3
 BuildRequires: perl-Net-Ident
+BuildRequires: perl-NetAddr-IP >= 4.000
 #BuildRequires:        perl-Razor2
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: perl-libwww
@@ -47,7 +48,7 @@ BuildRequires:        rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.453
 %if %{with tests}
 # are these really needed?
-BuildRequires: perl-Compress-Zlib
+#BuildRequires:        perl-Compress-Zlib
 BuildRequires: perl-Encode-Detect
 BuildRequires: perl-MIME-Base64
 BuildRequires: perl-MIME-tools
@@ -109,6 +110,7 @@ Requires:   perl-Mail-SpamAssassin = %{version}-%{release}
 Requires:      rc-scripts
 Suggests:      perl-Apache-Test
 Suggests:      perl-IO-Socket-SSL
+Suggests:      perl-IO-Socket-IP
 Suggests:      perl-Net-Ident
 
 %description spamd
@@ -330,11 +332,14 @@ fi
 %attr(755,root,root) %{_bindir}/sa-learn
 %attr(755,root,root) %{_bindir}/sa-awl
 %attr(755,root,root) %{_bindir}/spamassassin
+%attr(755,root,root) %{_bindir}/sa-check_spamd
 
 # It's needed for help of spamassassin command.
 %{perl_vendorlib}/spamassassin-run.pod
-%{_mandir}/man1/sa-learn*
-%{_mandir}/man1/spamassassin*
+%{_mandir}/man1/sa-learn.1*
+%{_mandir}/man1/spamassassin.1*
+%{_mandir}/man1/spamassassin-run.1*
+%{_mandir}/man1/sa-awl.1*
 
 %files spamd
 %defattr(644,root,root,755)
@@ -342,18 +347,18 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/spamd
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/spamd
 %attr(755,root,root) %{_bindir}/spamd
-%{_mandir}/man1/spamd*
+%{_mandir}/man1/spamd.1*
 
 %files spamc
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/spamassassin-spamc.rc
 %attr(755,root,root) %{_bindir}/spamc
-%{_mandir}/man1/spamc*
+%{_mandir}/man1/spamc.1*
 
 %files compile
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/sa-compile
-%{_mandir}/man1/sa-compile*
+%{_mandir}/man1/sa-compile.1*
 %dir /var/lib/spamassassin/compiled
 %dir /var/lib/spamassassin/compiled/%{sa_version}
 
@@ -367,7 +372,7 @@ fi
 %attr(755,root,root) %{_datadir}/spamassassin/sa-update.cron
 %{_datadir}/spamassassin/sa-update-pubkey.txt
 %dir /var/lib/spamassassin/%{sa_version}
-%{_mandir}/man1/sa-update*
+%{_mandir}/man1/sa-update.1*
 
 %files -n perl-Mail-SpamAssassin
 %defattr(644,root,root,755)
@@ -376,12 +381,12 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/*.pre
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/*.cf
 %exclude %{_sysconfdir}/mail/spamassassin/sa-update-keys
-
 %dir %{_datadir}/spamassassin
-%config(noreplace) %{_datadir}/spamassassin/*
+%config(noreplace) %{_datadir}/spamassassin/languages
+%config(noreplace) %{_datadir}/spamassassin/user_prefs.template
 %exclude %{_datadir}/spamassassin/sa-update-pubkey.txt
 
 %dir /var/lib/spamassassin
 
 %{perl_vendorlib}/Mail/*
-%{_mandir}/man3/*
+%{_mandir}/man3/*.3*