From 4738928c2713086f7ce3cb39c1b49ab290a0db57 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 12:38:53 +0000
Subject: auto-import changelog data from spamassassin-3.0-0.0.svn20040524.src.rpm

Mon May 24 2004 Warren Togami <wtogami@redhat.com> - 3.0-svn20040524
- #123432 do not start service by default
- #122488 remove CRLF's
- #123706 correct license
- svn snapshot 20040524
- svn snapshot 20040518

---

diff --git a/.cvsignore b/.cvsignore
index 3423842..a068371 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Mail-SpamAssassin-3.0-svn20040518.tar.bz2
+Mail-SpamAssassin-3.0-svn20040524.tar.bz2
diff --git a/sources b/sources
index feda12a..af5aa13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69c60fe98b3d3aa8162700b576af42f5  Mail-SpamAssassin-3.0-svn20040518.tar.bz2
+3ff9b8c010714a55f5b808ad49d9347b  Mail-SpamAssassin-3.0-svn20040524.tar.bz2
diff --git a/spamassassin.spec b/spamassassin.spec
index 920f59e..f76a064 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -7,13 +7,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents.
 Name: %{name}
 Version: 3.0
-Release: 0.0.svn20040518
-License: GPL or Artistic
+Release: 0.0.svn20040524
+License: Apache License
 Group: Applications/Internet
 URL: http://spamassassin.org/
 # Subversion Snapshot
 # http://wiki.apache.org/spamassassin/DownloadFromSvn
-Source0: Mail-SpamAssassin-3.0-svn20040518.tar.bz2
+Source0: Mail-SpamAssassin-3.0-svn20040524.tar.bz2
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -21,11 +21,12 @@ Source5: spamassassin.sysconfig
 Source10: spamassassin-helper.sh
 Source99: filter-requires-spamassassin.sh
 Patch3: spamassassin-2.63-krb5-backcompat.patch
+# SEND TO UPSTREAM: disable service by default
+Patch4: spamassassin-3.0-disable_service.patch
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
 Prefix: %{_prefix}
 Requires: /sbin/chkconfig /sbin/service
-#Distribution: SpamAssassin
 
 BuildRequires: perl-Net-DNS
 BuildRequires: perl >= 2:5.8.0
@@ -67,6 +68,9 @@ echo %{krb5backcompat}
 %patch3 -p1
 %endif
 
+# SEND TO UPSTREAM: disable service by default
+%patch4 -p1
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
 %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null
@@ -143,7 +147,11 @@ fi
 exit 0
 
 %changelog
-* Tue May 18 2004 Warren Togami <wtogami@redhat.com> - 3.0-svn20040518
+* Tue May 24 2004 Warren Togami <wtogami@redhat.com> - 3.0-svn20040524
+- #123432 do not start service by default
+- #122488 remove CRLF's
+- #123706 correct license
+- svn snapshot 20040524
 - svn snapshot 20040518
 
 * Sun May  2 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.63-8
diff --git a/spamassassin.sysconfig b/spamassassin.sysconfig
index 9faf7e2..52c1552 100644
--- a/spamassassin.sysconfig
+++ b/spamassassin.sysconfig
@@ -1,2 +1,2 @@
-# Options to spamd
-SPAMDOPTIONS="-d -c -a -m5 -H"
+# Options to spamd
+SPAMDOPTIONS="-d -c -a -m5 -H"