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: 04-Apr-2006 08:37:06
Branch: HEAD Handle: 2006040407370500
Modified files:
openpkg-src/amavisd amavisd.patch amavisd.spec
Log:
cleanup packaging
Summary:
Revision Changes Path
1.2 +15 -3 openpkg-src/amavisd/amavisd.patch
1.62 +6 -7 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 amavisd.patch
--- openpkg-src/amavisd/amavisd.patch 22 Aug 2005 06:13:47 -0000 1.1
+++ openpkg-src/amavisd/amavisd.patch 4 Apr 2006 06:37:05 -0000 1.2
@@ -1,7 +1,7 @@
Index: amavisd.conf
---- amavisd.conf.orig 2005-06-29 12:26:05.000000000 +0200
-+++ amavisd.conf 2005-08-17 16:51:05.325957000 +0200
-@@ -285,14 +285,14 @@
+--- amavisd.conf.orig 2006-04-03 16:32:25 +0200
++++ amavisd.conf 2006-04-04 08:33:40 +0200
+@@ -295,14 +295,14 @@
# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
# ['Sophos SAVI', \&sophos_savi ],
@@ -24,3 +24,15 @@
# ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred)
# ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/],
+Index: amavislogsumm
+--- amavislogsumm.orig 2006-04-04 08:33:40 +0200
++++ amavislogsumm 2006-04-04 08:33:40 +0200
+@@ -309,7 +309,7 @@
+ if ($spamCount > 0) {
+ printf "\tSPAM : %5.2f\n", ($spamHitSum / $spamCount);
+ }
+- if (($timeLineCount - $spamCount) > 0) {
++ if (($timeLineCount - $spamCount - $unscoredMail) > 0) {
+ printf "\tHAM : %5.2f\n", ($noneSpamHitSum / ($timeLineCount -
$spamCount - $unscoredMail));
+ print "\n";
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.61 -r1.62 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 4 Jan 2006 18:36:45 -0000 1.61
+++ openpkg-src/amavisd/amavisd.spec 4 Apr 2006 06:37:05 -0000 1.62
@@ -22,7 +22,8 @@
## SUCH DAMAGE.
##
-%define V_amavis 2.3.3
+# package versions
+%define V_amavis 2.4.0
%define V_logsumm 0.6
# package information
@@ -36,7 +37,7 @@
Group: Mail
License: GPL
Version: %{V_amavis}
-Release: 20060104
+Release: 20060404
# package options
%option with_milter no
@@ -45,7 +46,6 @@
Source0:
http://www.ijs.si/software/amavisd/amavisd-new-%{version}.tar.gz
Source1:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/amavisd/amavislogsumm-%{V_logsumm}
Source2: rc.amavisd
-Source3: amavislogsumm-%{V_logsumm}.patch
Patch0: amavisd.patch
# build information
@@ -84,6 +84,7 @@
%prep
%setup -q -n amavisd-new-%{version}
+ cp %{SOURCE amavislogsumm-%{V_logsumm}} amavislogsumm
%patch -p0
%build
@@ -166,14 +167,12 @@
%{l_shtool} install -c -m 755 \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
- %{SOURCE amavislogsumm-%{V_logsumm}} \
+ amavislogsumm \
$RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm
- %{l_patch} $RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm \
- %{SOURCE amavislogsumm-%{V_logsumm}.patch}
-
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config %{l_prefix}/etc/amavisd/amavisd.conf' \
+ '%doc %{l_prefix}/share/amavisd/docs/*' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/db' \
'%attr(0750,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/amavisd/tmp' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
