]> git.pld-linux.org Git - packages/spamassassin.git/blobdiff - spamassassin.spec
- restored version number in openssl BR
[packages/spamassassin.git] / spamassassin.spec
index fd32b3a1a6ac5c4ba1c8a95d3399713c68164887..12113d4122022ade95fd963da1319f33be9f0692 100644 (file)
@@ -1,5 +1,6 @@
 # TODO
 # - build lib{,ssl}spamc.so (if there is a point)
+# - sa-check_spamd into nagios-plugin-check_spamd subpackage
 #
 # Conditional build:
 %bcond_without tests           # do not perform "make test"
 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.2.5
-Release:       5
+Version:       3.3.2
+Release:       2
 License:       Apache v2.0
 Group:         Applications/Mail
-Source0:       http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
-# Source0-md5: 695f9107b240383e48df8938f2de334e
+Source0:       http://ftp.tpnet.pl/vol/d1/apache/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
+# Source0-md5: 253f8fcbeb6c8bfcab9d139865c1a404
 Source1:       %{name}.sysconfig
 Source2:       %{name}-spamd.init
 Source3:       %{name}-default.rc
 Source4:       %{name}-spamc.rc
 Source5:       sa-update.sh
 Source6:       sa-update.cron
-Patch0:                %{name}-bug-6269.patch
-Patch1:                %{name}-bug-6131.patch
 URL:           http://spamassassin.apache.org/
-BuildRequires: dos2unix
-BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: openssl-devel >= 1.0.0
 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16
 BuildRequires: perl-Archive-Tar
 BuildRequires: perl-DBI
@@ -39,13 +37,13 @@ BuildRequires:      perl-IO-Socket-SSL
 BuildRequires: perl-IO-Zlib
 BuildRequires: perl-IP-Country
 BuildRequires: perl-Mail-SPF-Query
-BuildRequires: perl-Net-DNS >= 0.34
+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
 BuildRequires: re2c
-BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.453
 %if %{with tests}
@@ -255,11 +253,6 @@ aplikacji do czytania poczty.
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
-dos2unix rules/72_active.cf
-%patch0 -p1
-%if "%{pld_release}" != "ac"
-%patch1 -p1
-%endif
 
 %build
 # for spamc/configure
@@ -278,7 +271,6 @@ export CFLAGS="%{rpmcflags}"
 
 %{__sed} -e "s,@@LOCAL_STATE_DIR@@,$(pwd)," sa-compile.raw > sa-compile.pl
 %{__perl} -T sa-compile.pl --siteconfigpath=rules
-rm -f compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps/body_0/.packlist
 
 %{?with_tests:%{__make} test}
 
@@ -300,7 +292,6 @@ install %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/sa-update
 install -d $RPM_BUILD_ROOT/var/lib/spamassassin/{%{sa_version},compiled/%{sa_version}}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys
 touch $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/sa-update-keys/{pubring,secring,trustdb}.gpg
-cp -a compiled/*/%{sa_version} $RPM_BUILD_ROOT/var/lib/spamassassin/compiled
 
 rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/Mail/SpamAssassin/.packlist,%{_mandir}/man3/spamassassin-run.*}
 
@@ -338,12 +329,16 @@ fi
 %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}/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)
@@ -351,35 +346,21 @@ 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}
 
-# maybe include these in main package?
-%dir /var/lib/spamassassin/compiled/%{sa_version}/auto
-%dir /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail
-%dir /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail/SpamAssassin
-%dir /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps
-%dir /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps/body_0
-%config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps/body_0/body_0.so
-%config(noreplace) %verify(not md5 mtime size) /var/lib/spamassassin/compiled/%{sa_version}/auto/Mail/SpamAssassin/CompiledRegexps/body_0/body_0.bs
-%dir /var/lib/spamassassin/compiled/%{sa_version}/Mail
-%dir /var/lib/spamassassin/compiled/%{sa_version}/Mail/SpamAssassin
-%dir /var/lib/spamassassin/compiled/%{sa_version}/Mail/SpamAssassin/CompiledRegexps
-%config(noreplace) %verify(not md5 mtime size) /var/lib/spamassassin/compiled/%{sa_version}/Mail/SpamAssassin/CompiledRegexps/body_0.pm
-%config(noreplace) %verify(not md5 mtime size) /var/lib/spamassassin/compiled/%{sa_version}/bases_body_0.pl
-
 %files update
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/spamassassin/channels
@@ -390,7 +371,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)
@@ -407,4 +388,4 @@ fi
 %dir /var/lib/spamassassin
 
 %{perl_vendorlib}/Mail/*
-%{_mandir}/man3/*
+%{_mandir}/man3/*.3*
This page took 0.036468 seconds and 4 git commands to generate.