diff -r 642966b63c34 -r d2e66a0e1aa8 dovecot/dovecot.spec
--- a/dovecot/dovecot.spec	Thu Nov 05 18:05:07 2009 +0100
+++ b/dovecot/dovecot.spec	Thu Nov 05 18:06:08 2009 +0100
@@ -42,7 +42,7 @@
 Group:        Mail
 License:      MIT+LGPL
 Version:      %{V_major}.%{V_minor}
-Release:      20091101
+Release:      20091104
 
 #   package options
 %option       with_fsl          yes
@@ -176,6 +176,7 @@
         --datadir=%{l_prefix}/share/dovecot \
         --docdir=%{l_prefix}/share/dovecot/doc \
         --with-rundir=%{l_prefix}/var/dovecot/run \
+        --with-statedir=%{l_prefix}/var/dovecot/dat \
         --with-libiconv-prefix=%{l_prefix} \
         --with-ssl=openssl \
         --with-docs \
@@ -218,7 +219,6 @@
         --without-gssapi \
         --without-lucene \
         --without-vpopmail \
-        --enable-shared \
         --disable-static
     %{l_make} %{l_mflags -O}
 
@@ -254,28 +254,29 @@
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
 %if "%{with_sieve}" == "yes"
     #   install optional Dovecot LDA sieve plugin
     ( cd dovecot-%{V_sieve_base}-sieve-%{V_sieve}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
     ) || exit $?
 %endif
 %if "%{with_managesieve}" == "yes"
     #   install optional Dovecot LDA managesieve daemon
     ( cd dovecot-%{V_managesieved_base}-managesieve-%{V_managesieved}
-      %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
     ) || exit $?
 %endif
 
     #   create additional dirctories
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/ssl \
+        $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/dat \
         $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/log \
         $RPM_BUILD_ROOT%{l_prefix}/var/dovecot/run/login
 
-    #   install run-command script
+    #   install runcommand 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} \
@@ -286,6 +287,10 @@
     rm -f $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/dovecot*example.conf
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \
         >/dev/null 2>&1 || true
+    rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/auth \
+        $RPM_BUILD_ROOT%{l_prefix}/include/dovecot \
+        $RPM_BUILD_ROOT%{l_prefix}/include \
+        >/dev/null 2>&1 || true
     strip \
         $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
         $RPM_BUILD_ROOT%{l_prefix}/libexec/dovecot/* \
@@ -294,7 +299,7 @@
     #   install default server configuration
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot
-    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+    %{l_shtool} install -c -m 640 %{l_value -s -a} \
         %{SOURCE dovecot.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot/
 
@@ -310,12 +315,13 @@
         '%not %dir %{l_prefix}/etc/fsl' \
         '%config %{l_prefix}/etc/fsl/fsl.dovecot' \
         '%config %attr(0600,%{l_musr},%{l_mgrp}) %{l_prefix}/etc/dovecot/*' \
-        '%config %attr(0644,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \
+        '%config %attr(0640,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/dovecot/dovecot.conf' \
         '%dir %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/dovecot/ssl' \
-        '%dir %attr(0755,%{l_susr},%{l_mgrp}) %{l_prefix}/var/dovecot' \
-        '%dir %attr(0770,%{l_susr},%{l_rgrp}) %{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(0755,%{l_musr},%{l_mgrp}) %{l_prefix}/var/dovecot' \
+        '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/dat' \
+        '%dir %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/log' \
+        '%dir %attr(0750,%{l_musr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \
+        '%dir %attr(0750,%{l_musr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \
         '%doc %{l_prefix}/share/dovecot/doc' \
         '%doc %{l_prefix}/share/dovecot/doc/wiki'
 
@@ -336,6 +342,7 @@
     [ $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/dat/*       >/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