that didn't work... just revert

This commit is contained in:
Warren Togami 2009-09-10 16:44:31 +00:00
parent 3e64fdd96e
commit 42e3e1c6bf
3 changed files with 13 additions and 25 deletions

View File

@ -1 +1,2 @@
mcsnapshot.tgz
Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz

View File

@ -1 +1,2 @@
57a321c63b1a97ee43d33a3bddced6d1 mcsnapshot.tgz
1b396a9df1faa22185263c7526fe6042 Mail-SpamAssassin-3.3.0-alpha2.tar.bz2
daaca5fba5787774eb918e1a5e92be6a Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz

View File

@ -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}
@ -35,15 +35,13 @@
Summary: Spam filter for email which can be invoked from mail delivery agents
Name: spamassassin
Version: 3.3.0
%define prename mcsnapshot
Release: 0.11.%{prename}%{?dist}
%define prename alpha2
Release: 0.6.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
# Temporary tarball before alpha3
Source0: mcsnapshot.tgz
#Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
Source0: http://www.apache.org/dist/%{name}/%{real_name}-%{version}-%{prename}.tar.bz2
Source1: Mail-SpamAssassin-rules-3.3.0-alpha2.r802600.tgz
Source2: redhat_local.cf
Source3: spamassassin-default.rc
Source4: spamassassin-spamc.rc
@ -112,9 +110,7 @@ To filter spam for all users, add that line to /etc/procmailrc
(creating if necessary).
%prep
#%setup -q -n Mail-SpamAssassin-%{version}
# Temporary before alpha3
%setup -q -n mcsnapshot
%setup -q -n Mail-SpamAssassin-%{version}
# Patches 0-99 are RH specific
# none yet
# Patches 100+ are SVN backports (DO NOT REUSE!)
@ -158,13 +154,9 @@ 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
#cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
#tar xfvz %{SOURCE1}
#cd -
cp rules/*.cf $RPM_BUILD_ROOT%{_datadir}/spamassassin/
rm -f $RPM_BUILD_ROOT%{_datadir}/spamassassin/70_sandbox.cf
rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Util/MemoryDump.pm
rm -f /usr/lib/perl5/vendor_perl/*/Mail/SpamAssassin/Plugin/RabinKarpBody.pm
cd $RPM_BUILD_ROOT%{_datadir}/spamassassin/
tar xfvz %{SOURCE1}
cd -
find $RPM_BUILD_ROOT/usr -type f -print |
sed "s@^$RPM_BUILD_ROOT@@g" |
@ -230,12 +222,6 @@ fi
exit 0
%changelog
* Thu Sep 10 2009 Warren Togami <wtogami@redhat.com> 3.3.3-0.11.mcsnapshot
- numerous bugs fixed
- this snapshot is used during masscheck underway until
September 17th in order to determine the base scores for spamassassin-3.3.0.
Your participation is needed! Please read http://wiki.apache.org/spamassassin/RescoreDetails
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 3.3.0-0.6.alpha2
- rebuilt with new openssl