diff --git a/.cvsignore b/.cvsignore index 008fe4e..3423842 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Mail-SpamAssassin-2.63.tar.bz2 +Mail-SpamAssassin-3.0-svn20040518.tar.bz2 diff --git a/sources b/sources index f9faf70..feda12a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -215303794096bc66712381115adabb25 Mail-SpamAssassin-2.63.tar.bz2 +69c60fe98b3d3aa8162700b576af42f5 Mail-SpamAssassin-3.0-svn20040518.tar.bz2 diff --git a/spamassassin.spec b/spamassassin.spec index a232659..920f59e 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -6,22 +6,21 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: %{name} -Version: 2.63 -Release: 8 +Version: 3.0 +Release: 0.0.svn20040518 License: GPL or Artistic Group: Applications/Internet URL: http://spamassassin.org/ -Source0: http://spamassassin.org/devel/Mail-SpamAssassin-%{version}.tar.bz2 +# Subversion Snapshot +# http://wiki.apache.org/spamassassin/DownloadFromSvn +Source0: Mail-SpamAssassin-3.0-svn20040518.tar.bz2 Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc Source5: spamassassin.sysconfig Source10: spamassassin-helper.sh Source99: filter-requires-spamassassin.sh -# Patch: spamassassin-2.50-servicename.patch -# Patch2: spamassassin-2.50-chld.patch Patch3: spamassassin-2.63-krb5-backcompat.patch -Patch4: spamassassin-2.63-init.patch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Buildroot: %{_tmppath}/%{name}-root Prefix: %{_prefix} @@ -59,16 +58,14 @@ To filter spam for all users, add that line to /etc/procmailrc (creating if necessary). %prep -%setup -q -n %{real_name}-%{version} -# %%patch0 -p1 -# %%patch2 -p1 +%setup -q -n spamassassin +# %%setup -q -n %{real_name}-%{version} + # Backwards compatibility with older krb5-devel echo %{krb5backcompat} %if %{krb5backcompat} %patch3 -p1 %endif -%patch4 -p0 -chmod 644 License %build export CFLAGS="$RPM_OPT_FLAGS" @@ -114,8 +111,8 @@ fi %files -f %{name}-%{version}-filelist %defattr(-,root,root) -%doc README Changes sample-nonspam.txt sample-spam.txt spamd/README.spamd -%doc License +%doc README Changes sample-nonspam.txt sample-spam.txt +%doc LICENSE %config(noreplace) %{_initrddir}/spamassassin %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin @@ -146,6 +143,9 @@ fi exit 0 %changelog +* Tue May 18 2004 Warren Togami - 3.0-svn20040518 +- svn snapshot 20040518 + * Sun May 2 2004 Ville Skyttä - 2.63-8 - #122233 - Require perl(:MODULE_COMPAT_*).