rpms/spamassassin/devel .cvsignore, 1.45, 1.46 sources, 1.44, 1.45 spamassassin.spec, 1.115, 1.116 Mail-SpamAssassin-3.3.0-missing-pre.patch, 1.1, NONE Mail-SpamAssassin-3.3.0-perl-bug-taint.patch, 1.1, NONE

[Warren Togami 砥上勇]

Author: wtogami

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

Modified Files:
	.cvsignore sources spamassassin.spec 
Removed Files:
	Mail-SpamAssassin-3.3.0-missing-pre.patch 
	Mail-SpamAssassin-3.3.0-perl-bug-taint.patch 
Log Message:
3.3.0-alpha2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- .cvsignore	7 Jul 2009 21:15:37 -0000	1.45
+++ .cvsignore	10 Aug 2009 04:26:00 -0000	1.46
@@ -1,2 +1,2 @@
-Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
-spamassassin-rules-791756.tar.bz2
+Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/sources,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- sources	7 Jul 2009 21:15:37 -0000	1.44
+++ sources	10 Aug 2009 04:26:00 -0000	1.45
@@ -1,2 +1,2 @@
-04141392e1f20ea4a91bb63937351c65  Mail-SpamAssassin-3.3.0-alpha1.tar.bz2
-26eaca54924365ed7db538fdbeef7b11  spamassassin-rules-791756.tar.bz2
+1b396a9df1faa22185263c7526fe6042  Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
+daaca5fba5787774eb918e1a5e92be6a  Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz


Index: spamassassin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spamassassin/devel/spamassassin.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -p -r1.115 -r1.116
--- spamassassin.spec	27 Jul 2009 04:38:13 -0000	1.115
+++ spamassassin.spec	10 Aug 2009 04:26:00 -0000	1.116
@@ -1,5 +1,5 @@
 # OVERRIDE RHEL VERSION HERE, RHEL BUILDSYSTEM DOESN'T HAVE DIST TAG
-#%%define rhel 5
+#%%define rhel 4
 
 # Define Variables that must exist
 %{?!rhel:%define rhel 0}
@@ -41,14 +41,13 @@
 Summary: Spam filter for email which can be invoked from mail delivery agents
 Name: spamassassin
 Version: 3.3.0
-%define prename alpha1
-Release: 0.3.alpha1%{?dist}
-%define rules_ver 791756
+%define prename alpha2
+Release: 0.4.alpha2%{?dist}
 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
+Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
 Source2: redhat_local.cf
 Source3: spamassassin-default.rc
 Source4: spamassassin-spamc.rc
@@ -60,8 +59,6 @@ Source10: spamassassin-helper.sh
 # Patches 0-99 are RH specific
 # none yet
 # Patches 100+ are SVN backports (DO NOT REUSE!)
-Patch100: Mail-SpamAssassin-3.3.0-missing-pre.patch
-Patch101: Mail-SpamAssassin-3.3.0-perl-bug-taint.patch
 # end of patches
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Buildroot: %{_tmppath}/%{name}-root
@@ -121,13 +118,10 @@ 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!)
-%patch100 -p1
-%patch101 -p0
+
 # end of patches
 
 %build
@@ -167,8 +161,9 @@ find $RPM_BUILD_ROOT \( -name perllocal.
 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
+cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
+tar xfvz %{SOURCE1}
+cd -
 
 find $RPM_BUILD_ROOT/usr -type f -print |
         sed "s@^$RPM_BUILD_ROOT@@g" |
@@ -234,8 +229,8 @@ fi
 exit 0
 
 %changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-0.3.alpha1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Mon Aug 10 2009 Warren Togami <wtogami at redhat.com> - 3.3.0-0.4.alpha1
+- 3.3.0-alpha2
 
 * 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.


--- Mail-SpamAssassin-3.3.0-missing-pre.patch DELETED ---


--- Mail-SpamAssassin-3.3.0-perl-bug-taint.patch DELETED ---