From 3680938057735bf08f1a1f99980bb448b78a46b2 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Jan 21 2010 17:14:10 +0000
Subject: - 3.3.0 (really this time!)

- README.RHEL.Fedora

---

diff --git a/.cvsignore b/.cvsignore
index 9b1fe99..c1f52b8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 Mail-SpamAssassin-3.3.0.tar.bz2
-Mail-SpamAssassin-rules-3.3.0.tgz
+Mail-SpamAssassin-rules-3.3.0.r901671.tgz
diff --git a/README.RHEL.Fedora b/README.RHEL.Fedora
new file mode 100644
index 0000000..094f92f
--- /dev/null
+++ b/README.RHEL.Fedora
@@ -0,0 +1,36 @@
+Spamassassin for RHEL or Fedora
+===============================
+spamassassin-3.3.x RPM package for RHEL 5+ or Fedora 11+ contains some new 
+functionality beyond the upstream spamassassin documentation.
+
+Upstream spamassassin-3.3.0 is no longer distributed with rules.  Our package 
+contains rules in order to be less of a surprise to system administrators.
+Just as you wouldn't rely on antivirus software without signature updates,
+spamassassin cannot be relied upon without regular rule updates.
+
+1) For these reasons, our RPM package now runs nightly sa-update by default.
+
+/etc/cron.d/sa-update
+The default cron runs sa-update once every night.  You may edit this cron 
+file to change the schedule of sa-update or to disable it entirely.  If you 
+had modified this file in the past you may need to restore the new file 
+from /etc/cron.d/sa-update.rpmnew
+
+2) /usr/share/spamassassin/sa-update.cron
+This script is executed by cron.  It runs sa-update only if a known spam 
+daemon is running: spamd, amavisd, or mimedefang.  If you do not run any
+of these spam daemons but wish to have nightly sa-update, you may 
+override the daemon check in /etc/sysconfig/sa-update
+
+3) /etc/mail/spamassassin/channel.d
+All sa-update channels are defined in files contained in this directory.
+See the existing config files as examples for writing your own config file.
+
+4) SOUGHT Anti-Fraud Rule Channel is Enabled by Default
+http://wiki.apache.org/spamassassin/SoughtRules
+
+General Warnings
+================
+* DO NOT USE SARE or OpenProtect rules.  They are old and outdated, and
+  can be dangerous.  Many of the useful rules have been integrated into
+  upstream spamassassin.
diff --git a/sources b/sources
index dda7a52..7b344f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-58a439f930b49b0a3747c6caa738acc6  Mail-SpamAssassin-3.3.0.tar.bz2
-5052e3c1e736e9b7decd6f158e190196  Mail-SpamAssassin-rules-3.3.0.tgz
+15af629a95108bf245ab600d78ae754b  Mail-SpamAssassin-3.3.0.tar.bz2
+5be313a60c27ae522700e20b557ade33  Mail-SpamAssassin-rules-3.3.0.r901671.tgz
diff --git a/spamassassin.spec b/spamassassin.spec
index 901d35e..a9d708d 100644
--- a/spamassassin.spec
+++ b/spamassassin.spec
@@ -51,12 +51,12 @@ Requires: portreserve
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}.tar.bz2
-Source1: Mail-SpamAssassin-rules-3.3.0.tgz
+Source1: Mail-SpamAssassin-rules-3.3.0.r901671.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -68,6 +68,7 @@ Source9: sa-update.force-sysconfig
 Source10: spamassassin-helper.sh
 Source11: spamassassin-official.conf
 Source12: sought.conf
+Source13: README.RHEL.Fedora
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -208,10 +209,13 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/mail/spamassassin/chan
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/portreserve
 echo 783 > $RPM_BUILD_ROOT%{_sysconfdir}/portreserve/spamd
 
+install -m 0644 %{SOURCE13} $RPM_BUILD_DIR/Mail-SpamAssassin-%{version}/
+
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 %doc LICENSE NOTICE CREDITS Changes README TRADEMARK UPGRADE
-%doc USAGE sample-nonspam.txt sample-spam.txt
+%doc USAGE sample-nonspam.txt sample-spam.txt 
+%doc README.RHEL.Fedora
 %{_initrddir}/spamassassin
 %config(noreplace) %{_sysconfdir}/mail/spamassassin
 %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin
@@ -260,6 +264,10 @@ fi
 exit 0
 
 %changelog
+* Thu Jan 21 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-2
+- 3.3.0 (really this time!)
+- README.RHEL.Fedora
+
 * Mon Jan 18 2010 Warren Togami <wtogami@redhat.com> - 3.3.0-1
 - 3.3.0