OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jul-2005 11:11:37
Branch: HEAD Handle: 2005072610113600
Added files:
openpkg-src/spamassassin
spamassassin.patch
Modified files:
openpkg-src/spamassassin
spamassassin.spec
Log:
cleanup packaging
Summary:
Revision Changes Path
1.2 +24 -0 openpkg-src/spamassassin/spamassassin.patch
1.61 +6 -9 openpkg-src/spamassassin/spamassassin.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.patch
============================================================================
$ cvs diff -u -r0 -r1.2 spamassassin.patch
--- /dev/null 2005-07-26 11:11:24 +0200
+++ spamassassin.patch 2005-07-26 11:11:37 +0200
@@ -0,0 +1,24 @@
+Index: sa-learn.raw
+--- sa-learn.raw.orig 2005-03-19 01:06:29 +0100
++++ sa-learn.raw 2005-07-26 11:01:39 +0200
+@@ -660,7 +660,7 @@
+
+ Read user score preferences from I<prefs> (usually
C<$HOME/.spamassassin/user_prefs>).
+
+- =item B<-D>, B<--debug-level>
++=item B<-D>, B<--debug-level>
+
+ Produce diagnostic output.
+
+Index: spamc/spamc.c
+--- spamc/spamc.c.orig 2004-08-27 18:37:42 +0200
++++ spamc/spamc.c 2005-07-26 11:01:39 +0200
+@@ -469,7 +469,7 @@
+ #endif
+
+ #ifndef _WIN32
+- openlog("spamc", LOG_CONS | LOG_PID, LOG_MAIL);
++ openlog("spamc", LOG_CONS | LOG_PID, LOG_USER);
+ signal(SIGPIPE, SIG_IGN);
+ #endif
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/spamassassin/spamassassin.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 spamassassin.spec
--- openpkg-src/spamassassin/spamassassin.spec 25 Jul 2005 19:45:31
-0000 1.60
+++ openpkg-src/spamassassin/spamassassin.spec 26 Jul 2005 09:11:36
-0000 1.61
@@ -38,7 +38,7 @@
Group: Mail
License: ASF
Version: %{V_here}
-Release: 20050725
+Release: 20050726
# package options
%option with_fsl yes
@@ -48,6 +48,7 @@
Source1: rc.spamassassin
Source2: local.cf
Source3: fsl.spamassassin
+Patch0: spamassassin.patch
# build information
Prefix: %{l_prefix}
@@ -65,9 +66,9 @@
%description
SpamAssassin provides you with a way to reduce if not completely
- eliminate Unsolicited Commercial Email (SPAM) from your incoming
- email. It uses a genetic-algorithm evolved scoring system to
- identify messages which look spammy, then adds headers to the
+ eliminate Unsolicited Commercial Email (UCE, aka SPAM) from your
+ incoming email. It uses a genetic-algorithm evolved scoring system
+ to identify messages which look spammy, then adds headers to the
message so they can be filtered by the user's mail reading software.
This distribution includes the spamd/spamc components which create a
server that considerably speeds processing of mail.
@@ -81,11 +82,7 @@
%prep
%setup -q -n Mail-SpamAssassin-%{V_sdir}
-%if "%{with_fsl}" == "yes"
- %{l_shtool} subst \
- -e 's/openlog.*(\(.*\),\(.*\),.*)/openlog(\1,\2, LOG_USER)/' \
- spamc/spamc.c
-%endif
+ %patch -p0
%build
# configure package
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
