OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Matthias Kurz
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Aug-2005 17:19:41
Branch: HEAD Handle: 2005081716194000
Modified files:
openpkg-src/amavisd amavisd.spec
Log:
- taken over changes submitted by Bill Campbell
- moved amavislogsumm to ftp://ftp.openpkg.org/sources/CPY/VERSIONED/amavisd
and added tracking
- taken over amavisd.conf-sample and READMEs as mandatory docs
Summary:
Revision Changes Path
1.55 +25 -10 openpkg-src/amavisd/amavisd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.54 -r1.55 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 29 Jun 2005 18:48:06 -0000 1.54
+++ openpkg-src/amavisd/amavisd.spec 17 Aug 2005 15:19:40 -0000 1.55
@@ -22,6 +22,9 @@
## SUCH DAMAGE.
##
+%define V_amavis 2.3.2
+%define V_logsumm 0.6
+
# package information
Name: amavisd
Summary: Interface Daemon between MTA and Content Checker
@@ -32,16 +35,17 @@
Class: PLUS
Group: Mail
License: GPL
-Version: 2.3.2
-Release: 20050629
+Version: %{V_amavis}
+Release: 20050817
# package options
%option with_milter no
# list of sources
Source0:
http://www.ijs.si/software/amavisd/amavisd-new-%{version}.tar.gz
-Source1: http://homepages.hs-bremen.de/~renegat/amavislogsumm
+Source1:
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/amavisd/amavislogsumm-%{V_logsumm}
Source2: rc.amavisd
+Patch0: amavisd.patch
# build information
Prefix: %{l_prefix}
@@ -69,17 +73,25 @@
prog amavisd = {
version = %{version}
url = http://www.ijs.si/software/amavisd/
- regex = amavisd-new-(\d+\.\d+\.\d+)\.tar\.gz
+ regex = amavisd-new-(__VER__)\.tar\.gz
+ }
+ prog amavislogsumm = {
+ version = %{V_logsumm}
+ url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/
+ regex = amavislogsumm-(__VER__)
}
%prep
%setup -q -n amavisd-new-%{version}
+ %patch -p0
+
+%build
%{l_shtool} subst \
-e "s;'clamscan';'%{l_prefix}/bin/clamscan';g" \
-e "s;'uvscan';'%{l_prefix}/bin/uvscan';g" \
-e "s;'sweep';'%{l_prefix}/bin/sweep';g" \
-e "s;'f-prot';'%{l_prefix}/bin/f-prot';g" \
- -e 's;/var/amavis/clamd;%{l_prefix}/var/clamav/clamd.sock;g' \
+ -e 's;/var/run/clamav/clamd;%{l_prefix}/var/clamav/clamd.sock;g' \
-e 's;/var/amavis;%{l_prefix}/var/amavisd;g' \
-e 's;/var/virusmails;%{l_prefix}/var/amavisd/virusmails;g' \
-e 's;/usr/bin/sendmail;%{l_prefix}/sbin/sendmail;g' \
@@ -98,8 +110,6 @@
-e 's;/var/amavis;%{l_prefix}/var/amavisd;g' \
-e 's;/usr/lib/spamassassin;%{l_prefix}/lib/spamassassin;g' \
amavisd
-
-%build
%if "%{with_milter}" == "yes"
cd helper-progs
CC="%{l_cc}" \
@@ -123,6 +133,8 @@
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
$RPM_BUILD_ROOT%{l_prefix}/etc/amavisd \
$RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests \
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/docs \
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/examples \
$RPM_BUILD_ROOT%{l_prefix}/var/amavisd \
$RPM_BUILD_ROOT%{l_prefix}/var/amavisd/db \
$RPM_BUILD_ROOT%{l_prefix}/var/amavisd/tmp \
@@ -142,7 +154,10 @@
$RPM_BUILD_ROOT%{l_prefix}/share/amavisd/tests/
%{l_shtool} install -c -m 644 \
RELEASE_NOTES README_FILES/* \
- $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/docs/
+ %{l_shtool} install -c -m 644 \
+ amavisd.conf-sample \
+ $RPM_BUILD_ROOT%{l_prefix}/share/amavisd/examples/
%{l_shtool} install -c -m 755 %{l_value -s -a} \
%{SOURCE rc.amavisd} \
@@ -150,8 +165,8 @@
%{l_shtool} install -c -m 755 \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
- %{SOURCE amavislogsumm} \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/
+ %{SOURCE amavislogsumm-%{V_logsumm}} \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config %{l_prefix}/etc/amavisd/amavisd.conf' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
