SPECS: spamassassin.spec - AC-branch merge
glen
glen at pld-linux.org
Thu Jun 14 23:16:33 CEST 2007
Author: glen Date: Thu Jun 14 21:16:33 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- AC-branch merge
---- Files affected:
SPECS:
spamassassin.spec (1.127 -> 1.128)
---- Diffs:
================================================================
Index: SPECS/spamassassin.spec
diff -u SPECS/spamassassin.spec:1.127 SPECS/spamassassin.spec:1.128
--- SPECS/spamassassin.spec:1.127 Fri May 11 18:48:16 2007
+++ SPECS/spamassassin.spec Thu Jun 14 23:16:27 2007
@@ -1,11 +1,10 @@
# $Revision$, $Date$
# TODO
# - build lib{,ssl}spamc.so (if there is a point)
-# - Build (with tests) has perl-Mail-SPF and perl-Mail-SPF-Query in BR, but
-# they both package spfquery which makes poldek collide packages
-# - separate "compile" subpackage (sa-compile) with R: EU::MM, re2c, gcc
# - 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"
@@ -13,17 +12,20 @@
%include /usr/lib/rpm/macros.perl
%define pdir Mail
%define pnam SpamAssassin
+%define sa_version %(printf %d.%03d%03d $(echo %{version} | tr '.' ' '))
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.0
-Release: 2
+Release: 3
License: Apache Software License v2
Group: Applications/Mail
Source0: http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
# Source0-md5: 6840e3be132e2c3cbf66298b0227e880
Source1: %{name}.sysconfig
Source2: %{name}-spamd.init
+Source3: %{name}-default.rc
+Source4: %{name}-spamc.rc
URL: http://spamassassin.apache.org/
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.16
@@ -59,6 +61,7 @@
Requires: perl-Mail-SpamAssassin = %{version}-%{release}
Obsoletes: SpamAssassin
Suggests: spamassassin-update
+Suggests: spamassassin-compile
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreq 'perl(Razor2::Client::Agent)' 'perl(Razor::Agent)' 'perl(Razor::Client)' 'perl(DBI)' 'perl(Net::Ident)'
@@ -74,6 +77,13 @@
spamd/spamc components which create a server that considerably speeds
processing of mail.
+To enable spamassassin, if you are receiving mail locally, simply add
+this line to your ~/.procmailrc:
+INCLUDERC=/etc/mail/spamassassin/spamassassin-default.rc
+
+To filter spam for all users, add that line to /etc/procmailrc
+(creating if necessary).
+
%description -l pl.UTF-8
SpamAssassin daje możliwość zredukowania, jeśli nie kompletnego
wyeliminowania niezamawianej komercyjnej poczty (Unsolicited
@@ -137,6 +147,13 @@
overhead in loading, so it should be much faster to load than the
whole spamassassin program.
+To enable spamassassin, if you are receiving mail locally, simply add
+this line to your ~/.procmailrc:
+INCLUDERC=/etc/mail/spamassassin/spamassassin-spamc.rc
+
+To filter spam for all users, add that line to /etc/procmailrc
+(creating if necessary).
+
%description spamc -l pl.UTF-8
Spamc powinien być używany zamiast "spamassassina" w skryptach
przetwarzających pocztę. Zczytuje pocztę ze STDIN, kolejkuje ją a
@@ -144,6 +161,23 @@
Spamc stara się nie obciążać zbytnio procesora podczas ładowania,
dzięki czemu powinien działać szybciej niż sam spamassassin.
+%package compile
+Summary: sa-compile - compile SpamAssassin ruleset into native code
+Group: Applications/Mail
+Requires: gcc
+Requires: glibc-devel
+Requires: make
+Requires: perl(ExtUtils::MakeMaker)
+Requires: perl-Mail-SpamAssassin = %{version}-%{release}
+Requires: perl-devel
+Requires: re2c >= 0.10
+
+%description compile
+sa-compile uses "re2c" to compile the SpamAssassin ruleset. This is
+then used by the "Mail::SpamAssassin::Plugin::Rule2XSBody" plugin to
+speed up SpamAssassin's operation, where possible, and when that
+plugin is loaded.
+
%package update
Summary: sa-update - automate SpamAssassin rule updates
Summary(pl.UTF-8): sa-update - automatyczne uaktualnianie regułek SpamAssassina
@@ -216,6 +250,10 @@
CC="%{__cc}" \
OPTIMIZE="%{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}
%install
@@ -227,11 +265,14 @@
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
-# sa-update dirs
-install -d $RPM_BUILD_ROOT/var/lib/spamassassin/$(printf %d.%03d%03d $(echo %{version} | tr '.' ' '))
+# sa-update, sa-compile
+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.*}
@@ -261,12 +302,12 @@
%defattr(644,root,root,755)
%doc CREDITS Changes INSTALL README TRADEMARK UPGRADE USAGE
%doc procmailrc.example
-%attr(755,root,root) %{_bindir}/sa-compile
+%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
+
# It's needed for help of spamassassin command.
%{perl_vendorlib}/spamassassin-run.pod
-%{_mandir}/man1/sa-compile*
%{_mandir}/man1/sa-learn*
%{_mandir}/man1/spamassassin*
@@ -284,17 +325,37 @@
%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*
+%files compile
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/sa-compile
+%{_mandir}/man1/sa-compile*
+%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/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)
%attr(700,root,root) %dir %{_sysconfdir}/mail/spamassassin/sa-update-keys
%attr(700,root,root) %ghost %{_sysconfdir}/mail/spamassassin/sa-update-keys/*
%attr(755,root,root) %{_bindir}/sa-update
%{_datadir}/spamassassin/sa-update-pubkey.txt
-%dir /var/lib/spamassassin
-%dir /var/lib/spamassassin/*
+%dir /var/lib/spamassassin/%{sa_version}
%{_mandir}/man1/sa-update*
%files -n perl-Mail-SpamAssassin
@@ -309,6 +370,8 @@
%config(noreplace) %{_datadir}/spamassassin/*
%exclude %{_datadir}/spamassassin/sa-update-pubkey.txt
+%dir /var/lib/spamassassin
+
%{perl_vendorlib}/Mail/*
%{_mandir}/man3/*
@@ -318,6 +381,24 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.128 2007/06/14 21:16:27 glen
+- AC-branch merge
+
+Revision 1.125.2.5 2007/06/13 18:57:03 glen
+- added default procmail rules to packages (from fc)
+
+Revision 1.125.2.4 2007/06/13 18:23:14 glen
+- package compiled rules from default rules; maybe these work
+
+Revision 1.125.2.3 2007/06/13 17:50:05 glen
+- glibc-devel for gnu/stubs-32.h
+
+Revision 1.125.2.2 2007/06/13 17:40:47 glen
+- more -compile deps
+
+Revision 1.125.2.1 2007/06/13 17:36:45 glen
+- separated sa-compile (to -compile); rel 3
+
Revision 1.127 2007/05/11 16:48:16 radek
- release 2: base & spamd Suggests: -update; more TODO
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/spamassassin.spec?r1=1.127&r2=1.128&f=u
More information about the pld-cvs-commit
mailing list