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: 17-Mar-2008 10:00:32
Branch: HEAD Handle: 2008031709003100
Modified files:
openpkg-src/dovecot dovecot.spec
Log:
some package style polishing; SQLite support; fixed deinstallation;
fix linting problems related to %if construct mixed with shtool
install, etc.
Summary:
Revision Changes Path
1.3 +41 -19 openpkg-src/dovecot/dovecot.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dovecot/dovecot.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 dovecot.spec
--- openpkg-src/dovecot/dovecot.spec 14 Mar 2008 12:11:48 -0000 1.2
+++ openpkg-src/dovecot/dovecot.spec 17 Mar 2008 09:00:31 -0000 1.3
@@ -29,7 +29,7 @@
# package information
Name: dovecot
-Summary: IMAP4 and POP3 server
+Summary: IMAP4 & POP3 Server
URL: http://www.dovecot.org/
Vendor: Timo Sirainen et al.
Packager: OpenPKG Foundation e.V.
@@ -38,14 +38,15 @@
Group: Mail
License: MIT+LGPL
Version: %{V_major}.%{V_minor}
-Release: 20080314
+Release: 20080317
# package options
%option with_fsl yes
+%option with_pam no
%option with_ldap no
%option with_mysql no
-%option with_pam yes
%option with_pgsql no
+%option with_sqlite no
%option with_pop3d no
%option with_managesieve no
%option with_sieve yes
@@ -74,26 +75,31 @@
PreReq: openldap
%endif
%if "%{with_managesieve}" == "yes"
-BuildPreReq: autoconf, automake, gettext, libtool, pkgconfig
-PreReq: autoconf, automake, gettext, libtool, pkgconfig
-%endif
-%if "%{with_mysql}" == "yes"
-BuildPreReq: mysql, zlib
-PreReq: mysql, zlib
+BuildPreReq: autoconf, automake, pkgconfig, libtool
+BuildPreReq: gettext
+PreReq: gettext
%endif
%if "%{with_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
%endif
+%if "%{with_mysql}" == "yes"
+BuildPreReq: mysql, zlib
+PreReq: mysql, zlib
+%endif
%if "%{with_pgsql}" == "yes"
BuildPreReq: postgresql
PreReq: postgresql
%endif
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
AutoReq: no
AutoReqProv: no
%description
- Dovecot is an open source IMAP and POP3 server, written with
+ Dovecot is an Open Source IMAP and POP3 server, written with
security primarily in mind. Dovecot is an excellent choice for both
small and large installations. It's fast, simple to set up, requires
no special administration and it uses very little memory.
@@ -123,7 +129,7 @@
%{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
%if "%{with_managesieve}" == "yes"
sleep 1
- %{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1
+ %{l_gzip} -dc <%{PATCH1} | %{l_patch} -p1 -b
sleep 1
autoreconf -i --force || true
%endif
@@ -145,7 +151,10 @@
libs="$libs -lssl -lcrypto -lcrypt"
sql_drivers="$sql_drivers,pgsql"
%endif
- sql_drivers=`echo "$sql_drivers" | sed 's;,;;'`
+%if "%{with_sqlite}" == "yes"
+ sql_drivers="$sql_drivers,sqlite"
+%endif
+ sql_drivers=`echo "$sql_drivers" | sed 's;^,;;'`
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -166,7 +175,7 @@
%else
--without-ldap \
%endif
-%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes"
+%if "%{with_mysql}" == "yes" || "%{with_pgsql}" == "yes" || "%{with_sqlite}"
== "yes"
--with-sql \
--with-sql-drivers="$sql_drivers" \
%if "%{with_mysql}" == "yes"
@@ -179,9 +188,17 @@
%else
--without-pgsql \
%endif
+%if "%{with_sqlite}" == "yes"
+ --with-sqlite \
+%else
+ --without-sqlite \
+%endif
%else
--without-sql \
--without-sql-drivers \
+ --without-mysql \
+ --without-pgsql \
+ --without-sqlite \
%endif
%if "%{with_pam}" == "yes"
--with-pam \
@@ -193,7 +210,6 @@
%else
--without-pop3d \
%endif
- --without-sqlite \
--enable-shared \
--disable-static
%{l_make} %{l_mflags -O}
@@ -239,12 +255,13 @@
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
- %{l_shtool} install -c -m 755 %{l_value -s -a} \
%if "%{with_pop3d}" == "yes"
- -e '/<\/\{0,1\}with_pop3d>/d' \
+ cmd='/<\/\{0,1\}with_pop3d>/d'
%else
- -e '/<with_pop3d>/,/<\/with_pop3d>/d' \
+ 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/
@@ -272,7 +289,9 @@
'%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \
'%dir %attr(0770,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/log' \
'%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot/run' \
- '%dir %attr(0750,%{l_susr},%{l_mgrp})
%{l_prefix}/var/dovecot/run/login'
+ '%dir %attr(0750,%{l_susr},%{l_mgrp})
%{l_prefix}/var/dovecot/run/login' \
+ '%doc %{l_prefix}/share/dovecot/doc' \
+ '%doc %{l_prefix}/share/dovecot/wiki'
%files -f files
@@ -290,6 +309,9 @@
# before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} dovecot stop 2>/dev/null
- rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dovecot/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dovecot/log/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/dovecot/run/login/* >/dev/null 2>&1 || true
exit 0
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
