From 05cddc4685bd441dbb86e0d78d867764a4a40e57 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 12:35:12 +0000 Subject: auto-import changelog data from spamassassin-2.44-11.8.x.src.rpm Tue Feb 25 2003 Elliot Lee - rebuilt Fri Feb 21 2003 Chip Turner - revert double fix for 84774 Mon Feb 17 2003 Bill Nottingham - fix startup (#84445) Thu Feb 13 2003 Bill Nottingham - fix paths in initscript (#84216) Thu Feb 13 2003 Chip Turner - removing -P option since it is the default now, bug 84144 Wed Feb 12 2003 Florian La Roche - fix SIGCHLD handling Mon Feb 10 2003 Bill Nottingham - move condrestart to %postun Sun Feb 02 2003 Chip Turner - update to 2.44 - add condrestart to service script Thu Jan 30 2003 Chip Turner - release bump and rebuild Wed Jan 29 2003 Chip Turner - add upstream bsmtp off-by-one patch Mon Jan 20 2003 Chip Turner - add wrapper for 'spamassassin -e' for native evolution spam filtering Sat Jan 04 2003 Jeff Johnson 2.43-10 - use internal dep generator. Wed Jan 01 2003 Chip Turner - rebuild Tue Dec 17 2002 Bill Nottingham 2.43-7 - don't run by default Sat Dec 14 2002 Tim Powers 2.43-6 - don't use rpms internal dep generator - buildrequire perl-Time-HiRes instead of perl(Time:HiRes) so we can satisfy build deps in the build system --- diff --git a/.cvsignore b/.cvsignore index 392e817..e3284aa 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Mail-SpamAssassin-2.43.tar.gz +Mail-SpamAssassin-2.44.tar.gz diff --git a/sources b/sources index 7ad13fb..10cc7dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b39d3b597f8e0abd13aa9da46c83f2d2 Mail-SpamAssassin-2.43.tar.gz +d4ecf16765c338cebf7554c6d0028a2f Mail-SpamAssassin-2.44.tar.gz diff --git a/spamassassin-default.rc b/spamassassin-default.rc index 2c0500c..1d8365c 100644 --- a/spamassassin-default.rc +++ b/spamassassin-default.rc @@ -1,3 +1,3 @@ # send mail through spamassassin :0fw -| /usr/bin/spamassassin -P +| /usr/bin/spamassassin diff --git a/spamassassin-helper.sh b/spamassassin-helper.sh new file mode 100755 index 0000000..3cd4848 --- /dev/null +++ b/spamassassin-helper.sh @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/spamassassin -e diff --git a/spamassassin.spec b/spamassassin.spec index 9d90b10..885d6d0 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -1,11 +1,13 @@ +%define _use_internal_dependency_generator 0 + %define name spamassassin %define real_name Mail-SpamAssassin %define initdir %{_initrddir} -Summary: This is SpamAssassin, a spam filter for email which can be invoked from mail delivery agents. +Summary: Spam filter for email which can be invoked from mail delivery agents. Name: %{name} -Version: 2.43 -Release: 5 +Version: 2.44 +Release: 11.8.x License: Artistic Group: Applications/Internet URL: http://spamassassin.org/ @@ -14,16 +16,20 @@ Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc Source5: spamassassin.sysconfig +Source10: spamassassin-helper.sh Source99: filter-requires-spamassassin.sh +Patch: spamassassin-2.31-init.patch +Patch1: spamassassin-2.44-condrestart.patch +Patch2: spamassassin-2.44-chld.patch Requires: perl >= 5.004 Buildroot: %{_tmppath}/%{name}-root Prefix: %{_prefix} -Prereq: /sbin/chkconfig +Prereq: /sbin/chkconfig /sbin/service Distribution: SpamAssassin BuildRequires: perl-Net-DNS BuildRequires: perl >= 2:5.8.0 -BuildRequires: perl(Time::HiRes) +BuildRequires: perl-Time-HiRes Requires: perl-Net-DNS Requires: perl(Time::HiRes) @@ -33,7 +39,6 @@ Obsoletes: perl-Mail-SpamAssassin %define __find_requires %{SOURCE99} - %description SpamAssassin provides you with a way to reduce if not completely eliminate Unsolicited Commercial Email (SPAM) from your incoming email. It can @@ -53,6 +58,9 @@ To filter spam for all users, add that line to /etc/procmailrc %prep %setup -q -n %{real_name}-%{version} +%patch0 -p1 -b .init +%patch1 -p1 +%patch2 -p1 %build %{__perl} Makefile.PL PREFIX=$RPM_BUILD_ROOT/%{_prefix} SYSCONFDIR=$RPM_BUILD_ROOT/%{_sysconfdir} INST_PREFIX=%{_prefix} INST_SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor @@ -77,6 +85,7 @@ install -m644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/spamassassin install -m 0644 %{SOURCE3} %buildroot/etc/mail/spamassassin install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin +install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig @@ -113,6 +122,11 @@ if [ -f /etc/mail/spamassassin.cf ]; then %{__mv} /etc/mail/spamassassin.cf /etc/mail/spamassassin/migrated.cf fi +%postun +if [ "$1" -ge "1" ]; then + /sbin/service spamassassin condrestart > /dev/null 2>&1 +fi + %preun if [ $1 = 0 ] ; then /sbin/service spamassassin stop >/dev/null 2>&1 @@ -121,6 +135,53 @@ fi exit 0 %changelog +* Tue Feb 25 2003 Elliot Lee +- rebuilt + +* Fri Feb 21 2003 Chip Turner +- revert double fix for 84774 + +* Mon Feb 17 2003 Bill Nottingham +- fix startup (#84445) + +* Thu Feb 13 2003 Bill Nottingham +- fix paths in initscript (#84216) + +* Thu Feb 13 2003 Chip Turner +- removing -P option since it is the default now, bug 84144 + +* Wed Feb 12 2003 Florian La Roche +- fix SIGCHLD handling + +* Mon Feb 10 2003 Bill Nottingham +- move condrestart to %postun + +* Sun Feb 2 2003 Chip Turner +- update to 2.44 +- add condrestart to service script + +* Thu Jan 30 2003 Chip Turner +- release bump and rebuild + +* Wed Jan 29 2003 Chip Turner +- add upstream bsmtp off-by-one patch + +* Mon Jan 20 2003 Chip Turner +- add wrapper for 'spamassassin -e' for native evolution spam filtering + +* Sat Jan 4 2003 Jeff Johnson 2.43-10 +- use internal dep generator. + +* Wed Jan 1 2003 Chip Turner +- rebuild + +* Tue Dec 17 2002 Bill Nottingham 2.43-7 +- don't run by default + +* Sat Dec 14 2002 Tim Powers 2.43-6 +- don't use rpms internal dep generator +- buildrequire perl-Time-HiRes instead of perl(Time:HiRes) so we can satisfy build deps in the build system + * Fri Nov 22 2002 Tim Powers - rebuilt to solve broken perl deps