OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Jul-2009 23:04:36
Branch: HEAD Handle: 2009070722043500
Modified files:
openpkg-src/dovecot dovecot.spec rc.dovecot
Log:
modifying package: dovecot-1.2.0 20090705 -> 20090707
Summary:
Revision Changes Path
1.33 +5 -22 openpkg-src/dovecot/dovecot.spec
1.3 +0 -4 openpkg-src/dovecot/rc.dovecot
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 dovecot.spec
--- openpkg-src/dovecot/dovecot.spec 5 Jul 2009 16:14:17 -0000 1.32
+++ openpkg-src/dovecot/dovecot.spec 7 Jul 2009 21:04:35 -0000 1.33
@@ -25,11 +25,11 @@
%define V_major 1.2
%define V_minor 0
%define V_sieve_base 1.2
-%define V_sieve 0.1.6
-%define V_managesieve_base 1.2.rc5
-%define V_managesieve 0.11.5
+%define V_sieve 0.1.7
+%define V_managesieve_base 1.2.0
+%define V_managesieve 0.11.6
%define V_managesieved_base 1.2
-%define V_managesieved 0.11.5
+%define V_managesieved 0.11.6
# package information
Name: dovecot
@@ -42,7 +42,7 @@
Group: Mail
License: MIT+LGPL
Version: %{V_major}.%{V_minor}
-Release: 20090705
+Release: 20090707
# package options
%option with_fsl yes
@@ -53,7 +53,6 @@
%option with_mysql no
%option with_pgsql no
%option with_sqlite no
-%option with_pop3d no
# list of sources
Source0:
http://www.dovecot.org/releases/%{V_major}/dovecot-%{V_major}.%{V_minor}.tar.gz
@@ -139,10 +138,6 @@
%if "%{with_managesieve}" == "yes"
%setup -q -T -D -a 2
%{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b
- %{l_shtool} subst \
- -e
's;\(CLIENT_LOGIN_IDLE_TIMEOUT_MSECS.*\)(3\*60\*1000);\1(2*60*1000);' \
-
dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}/src/managesieve-login/client.h
-
%endif
%{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
@@ -183,7 +178,6 @@
--with-rundir=%{l_prefix}/var/dovecot/run \
--with-libiconv-prefix=%{l_prefix} \
--with-ssl=openssl \
- --with-deliver \
--with-docs \
%if "%{with_ldap}" == "yes"
--with-ldap \
@@ -220,11 +214,6 @@
%else
--without-pam \
%endif
-%if "%{with_pop3d}" == "yes"
- --with-pop3d \
-%else
- --without-pop3d \
-%endif
--without-gc \
--without-gssapi \
--without-lucene \
@@ -289,13 +278,7 @@
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-%if "%{with_pop3d}" == "yes"
- cmd='/<\/\{0,1\}with_pop3d>/d'
-%else
- cmd='/<with_pop3d>/,/<\/with_pop3d>/d'
-%endif
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- -e "$cmd" \
%{SOURCE rc.dovecot} \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/rc.dovecot
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.dovecot
--- openpkg-src/dovecot/rc.dovecot 4 Apr 2008 08:20:03 -0000 1.2
+++ openpkg-src/dovecot/rc.dovecot 7 Jul 2009 21:04:35 -0000 1.3
@@ -15,10 +15,6 @@
dovecot_deliver_log_numfiles="10"
dovecot_deliver_log_minsize="1M"
dovecot_deliver_log_complevel="9"
-<with_pop3d>
- POP_type="dovecot"
- POP_logfile="@l_prefix@/var/dovecot/log/dovecot.log"
-</with_pop3d>
%common
dovecot_pidfile="@l_prefix@/var/dovecot/run/master.pid"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
