rpms/spamassassin/devel .cvsignore, 1.44, 1.45 sources, 1.43, 1.44 spamassassin.spec, 1.113, 1.114

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/spamassassin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21971

Modified Files:
	.cvsignore sources spamassassin.spec 
Log Message:
- Include default rules to prevent mass confusion and complaints.
  You should really use sa-update though.  Really.
  Edit /etc/cron.d/sa-update to automate it.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	7 Jul 2009 15:14:52 -0000	1.44
+++ .cvsignore	7 Jul 2009 21:15:37 -0000	1.45
@@ -1 +1,2 @@
 Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
+spamassassin-rules-791756.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources	7 Jul 2009 15:14:52 -0000	1.43
+++ sources	7 Jul 2009 21:15:37 -0000	1.44
@@ -1 +1,2 @@
 04141392e1f20ea4a91bb63937351c65  Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
+26eaca54924365ed7db538fdbeef7b11  spamassassin-rules-791756.tar.bz2


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -p -r1.113 -r1.114
--- spamassassin.spec	7 Jul 2009 15:14:52 -0000	1.113
+++ spamassassin.spec	7 Jul 2009 21:15:37 -0000	1.114
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 4
+#%%define rhel 5
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -42,11 +42,13 @@ Summary: Spam filter for email which can
 Name: spamassassin
 Version: 3.3.0
 %define prename alpha1
-Release: 0.1.alpha1%{?dist}
+Release: 0.2.alpha1%{?dist}
+%define rules_ver 791756
 License: ASL 2.0
 Group: Applications/Internet
 URL: http://spamassassin.apache.org/
 Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
+Source1: spamassassin-rules-%{rules_ver}.tar.bz2
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -119,6 +121,8 @@ To filter spam for all users, add that l
 
 %prep
 %setup -q -n Mail-SpamAssassin-%{version}
+# Default rules from separate tarball
+tar xfvj %{SOURCE1}
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
@@ -162,6 +166,10 @@ install -m 0744 %{SOURCE8} %buildroot%{_
 find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 
+# Default rules from separate tarball
+mv updates_spamassassin_org/* $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/MIRRORED.BY
+
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
         grep -v perllocal.pod |
@@ -226,13 +234,13 @@ fi
 exit 0
 
 %changelog
+* Tue Jul 07 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.2.alpha1
+- Include default rules to prevent mass confusion and complaints.
+  You should really use sa-update though.  Really.
+  Edit /etc/cron.d/sa-update to automate it.
+
 * Mon Jul 06 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.1.alpha1
 - 3.3.0-alpha1
-- WARNING: spamassassin-3.3.0+ no longer ships with rules.
-  You must run sa-update to download rules before you use spamassassin.
-  Failure to download rules means spamassassin always returns unfiltered.
-  Should we ship a set of rules with spamassassin?  Please discuss on 
-  fedora-devel-list.
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.5-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild