SPECS (AC-branch): spamassassin.spec - separated sa-compile (to -c...

[glen]

Author: glen                         Date: Wed Jun 13 17:36:50 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- separated sa-compile (to -compile); rel 3

---- Files affected:
SPECS:
   spamassassin.spec (1.125 -> 1.125.2.1) 

---- Diffs:

================================================================
Index: SPECS/spamassassin.spec
diff -u SPECS/spamassassin.spec:1.125 SPECS/spamassassin.spec:1.125.2.1
--- SPECS/spamassassin.spec:1.125	Thu May  3 18:56:03 2007
+++ SPECS/spamassassin.spec	Wed Jun 13 19:36:45 2007
@@ -1,6 +1,10 @@
 # $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"
@@ -8,11 +12,12 @@
 %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:	1
+Release:	3
 License:	Apache Software License v2
 Group:		Applications/Mail
 Source0:	http://www.apache.net.pl/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -137,6 +142,22 @@
 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:	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
@@ -221,8 +242,8 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/spamd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamd
 
-# sa-update dirs
-install -d $RPM_BUILD_ROOT/var/lib/spamassassin/$(printf %d.%03d%03d $(echo %{version} | tr '.' ' '))
+# sa-update, sa-compile dirs
+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
 
@@ -254,12 +275,10 @@
 %defattr(644,root,root,755)
 %doc CREDITS Changes INSTALL README TRADEMARK UPGRADE USAGE
 %doc procmailrc.example
-%attr(755,root,root) %{_bindir}/sa-compile
 %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*
 
@@ -280,14 +299,20 @@
 %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}
+
 %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
@@ -302,6 +327,8 @@
 %config(noreplace) %{_datadir}/spamassassin/*
 %exclude %{_datadir}/spamassassin/sa-update-pubkey.txt
 
+%dir /var/lib/spamassassin
+
 %{perl_vendorlib}/Mail/*
 %{_mandir}/man3/*
 
@@ -311,6 +338,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
+Revision 1.126  2007/05/09 21:19:14  glen
+- can't send to builders :/
+
 Revision 1.125  2007/05/03 16:56:03  adamg
 - release 1, works for me
 
================================================================

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