# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1239222724 -7200
# Node ID 07c8003461c6358e12c0909099bdb33ae0c10d4d
# Parent  31dfae41ec78a6c915f046d0bf6ce0aa3481e61b
Correct paths, file attributes, and build configuration logic.

diff -r 31dfae41ec78 -r 07c8003461c6 dovecot/dovecot.spec
--- a/dovecot/dovecot.spec	Tue Apr 07 19:53:11 2009 +0200
+++ b/dovecot/dovecot.spec	Wed Apr 08 22:32:04 2009 +0200
@@ -170,6 +170,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-deliver \
@@ -250,7 +251,7 @@
 
     #   adjust file names of configuration files
     ( cd $RPM_BUILD_ROOT%{l_prefix}/etc/dovecot
-      for i in dovecot dovecot-ldap dovecot-sql; do
+      for i in dovecot dovecot-db dovecot-ldap dovecot-sql; do
           mv ${i}{-example,}.conf
       done
     ) || exit $?
@@ -258,10 +259,11 @@
     #   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
 %if "%{with_pop3d}" == "yes"
@@ -283,6 +285,9 @@
     #   strip installation
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/dovecot/{,*}/*.la \
         >/dev/null 2>&1 || true
+    rmdir $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/* \
@@ -296,9 +301,10 @@
         '%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/dat' \
         '%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_susr},%{l_rgrp}) %{l_prefix}/var/dovecot/run' \
+        '%dir %attr(0750,%{l_susr},%{l_ngrp}) %{l_prefix}/var/dovecot/run/login' \
         '%doc %{l_prefix}/share/dovecot/doc' \
         '%doc %{l_prefix}/share/dovecot/doc/wiki'
 
@@ -319,6 +325,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