SPECS: spamassassin.spec - add sa-update to spamassassin package (...

[glen]

Author: glen                         Date: Tue Oct  4 12:04:35 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add sa-update to spamassassin package (maybe to perl-Mail-SpamAssassin instead?)
- configure the way PACKAGING describes
- don not remove files in %install, it breaks --short-circuit
- add ldap to tools package %doc

---- Files affected:
SPECS:
   spamassassin.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/spamassassin.spec
diff -u SPECS/spamassassin.spec:1.80 SPECS/spamassassin.spec:1.81
--- SPECS/spamassassin.spec:1.80	Thu Sep 22 22:58:37 2005
+++ SPECS/spamassassin.spec	Tue Oct  4 14:04:30 2005
@@ -10,7 +10,7 @@
 Summary(pl):	Filtr antyspamowy, przeznaczony dla programów dostarczających pocztę (MDA)
 Name:		spamassassin
 Version:	3.1.0
-Release:	1
+Release:	1.2
 License:	Apache Software License v2
 Group:		Applications/Mail
 Source0:	http://www.apache.org/dist/spamassassin/source/%{pdir}-%{pnam}-%{version}.tar.bz2
@@ -158,13 +158,13 @@
 %setup -q -n %{pdir}-%{pnam}-%{version}
 
 %build
-echo "postmaster at localhost" | \
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor \
 	PREFIX=%{_prefix} \
 	SYSCONFDIR=%{_sysconfdir} \
 	ENABLE_SSL=yes \
-	PERL_BIN=%{__perl}
+	CONTACT_ADDRESS="postmaster at localhost" \
+	PERL_BIN=%{__perl} < /dev/null
 %{__make} \
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}"
@@ -183,8 +183,6 @@
 # shouldn't this script be called `spamd' instead?
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/spamassassin
 
-rm -f spamd/{*.sh,*.conf,spam*} contrib/snp.tar.gz
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -207,15 +205,17 @@
 %files
 %defattr(644,root,root,755)
 %doc BUGS CREDITS Changes INSTALL README STATUS TRADEMARK UPGRADE USAGE
-%doc procmailrc.example sample*.txt
+%doc procmailrc.example
 %attr(755,root,root) %{_bindir}/sa-learn
+%attr(755,root,root) %{_bindir}/sa-update
 %attr(755,root,root) %{_bindir}/spamassassin
 %{_mandir}/man1/sa-learn*
+%{_mandir}/man1/sa-update*
 %{_mandir}/man1/spamassassin*
 
 %files tools
 %defattr(644,root,root,755)
-%doc sql tools masses contrib
+%doc sql ldap tools masses contrib
 
 %files spamd
 %defattr(644,root,root,755)
@@ -246,6 +246,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2005/10/04 12:04:30  glen
+- add sa-update to spamassassin package (maybe to perl-Mail-SpamAssassin instead?)
+- configure the way PACKAGING describes
+- don not remove files in %install, it breaks --short-circuit
+- add ldap to tools package %doc
+
 Revision 1.80  2005/09/22 20:58:37  arekm
 - more R
 
================================================================

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