From 4762e4f56d18758f50b742b40b089301db6df1f2 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: May 17 2011 04:24:10 +0000 Subject: 3.3.2-rc1 --- diff --git a/.gitignore b/.gitignore index e91dae1..eed098a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -Mail-SpamAssassin-3.3.1.tar.bz2 -Mail-SpamAssassin-rules-3.3.1.r923114.tgz -/Mail-SpamAssassin-3.3.2.tar.bz2 -/Mail-SpamAssassin-rules-3.3.2.r1004932.tgz +/Mail-SpamAssassin-3.3.2-rc1.tar.bz2 +/Mail-SpamAssassin-3.3.2-rc1.tar.bz2.asc /Mail-SpamAssassin-rules-3.3.2.r1071394.tgz diff --git a/sources b/sources index d6d575f..c874ebd 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ -e1129a862f82fe37a7789173f7d14be3 Mail-SpamAssassin-3.3.2.tar.bz2 +a6754627ff3cf97e1ea9bb47a24bd898 Mail-SpamAssassin-3.3.2-rc1.tar.bz2 +95113f34a8817c1c7db252ccda168819 Mail-SpamAssassin-3.3.2-rc1.tar.bz2.asc 65a45467a761c36e7c5c08d13a3f4501 Mail-SpamAssassin-rules-3.3.2.r1071394.tgz diff --git a/spamassassin.spec b/spamassassin.spec index 1f62c86..566d24c 100644 --- a/spamassassin.spec +++ b/spamassassin.spec @@ -55,18 +55,19 @@ Requires: portreserve %{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} %global saversion 3.003002 -%global svnrev 1071394 +%global prerev rc1 Summary: Spam filter for email which can be invoked from mail delivery agents Name: spamassassin Version: 3.3.2 -Release: 0.6.svn%{svnrev}%{?dist} +Release: 0.7.%{prerev}%{?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 -Source0: %{real_name}-%{version}.tar.bz2 -Source1: %{real_name}-rules-%{version}.r%{svnrev}.tgz +Source0: %{real_name}-%{version}-%{prerev}.tar.bz2 +#Source1: %{real_name}-rules-%{version}.%{prerev}.tgz +Source1: %{real_name}-rules-%{version}.r1071394.tgz Source2: redhat_local.cf Source3: spamassassin-default.rc Source4: spamassassin-spamc.rc @@ -156,6 +157,8 @@ To filter spam for all users, add that line to /etc/procmailrc # end of patches +echo "RHEL=%{rhel} FEDORA=%{fedora}" + %build export CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL DESTDIR=$RPM_BUILD_ROOT/ SYSCONFDIR=%{_sysconfdir} INSTALLDIRS=vendor ENABLE_SSL=yes < /dev/null @@ -279,6 +282,9 @@ fi exit 0 %changelog +* Mon May 16 2011 Warren Togami - 3.3.2-0.7.rc1 +- 3.3.2-rc1 + * Sun Feb 27 2011 Ville Skyttä - 3.3.2-0.6.svn1071394 - Own /etc/mail dir (#645035).