- define _localstatedir to /var/spool/courier-imap

- add trigger to change TLS_CACHEFILE to right location
- updated to 3.0.6; %%files fixes; rel. 1

Changed files:
    courier-imap.spec -> 1.128

diff --git a/courier-imap.spec b/courier-imap.spec
index b49ca0d08bf95a401f60c9092e674b2cba3c923f..b1e1310061a75d924c25d344aec7737adba33150 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -7,12 +7,12 @@
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       3.0.5
-Release:       2
+Version:       3.0.6
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 8b0c79997905dc46cfe4cc13be74ceaf
+# Source0-md5: f2d3c0d566ea6789192dc3cd5fd8f8fb
 Source1:       %{name}.init
 Source2:       %{name}-pop3.init
 Source3:       %{name}.pamd
@@ -45,6 +45,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _libexecdir     /usr/%{_lib}/courier-imap
 %define                _sysconfdir     /etc/courier-imap
 %define                _certsdir       %{_sysconfdir}/certs
+%define                _localstatedir  /var/spool/courier-imap
 
 %description
 Courier-IMAP is an IMAP server for Maildir mailboxes.
@@ -191,6 +192,7 @@ cd ../imap
 cd ..
 
 %configure \
+       --localstatedir=%{_localstatedir} \
        --libexecdir=%{_libexecdir} \
        --enable-unicode \
        --with-authchangepwdir=/var/tmp \
@@ -206,8 +208,7 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security,sysconfig} \
-       $RPM_BUILD_ROOT{%{_sysconfdir}/shared,%{_certsdir},/var/lib/authdaemon}
+install -d $RPM_BUILD_ROOT{/etc/{pam.d,rc.d/init.d,security},%{_certsdir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -320,6 +321,14 @@ if [ -f /var/lock/subsys/courier-imap ]; then
        /etc/rc.d/init.d/courier-imap restart >&2
 fi
 
+%triggerin -- %{name} < 3.0.6
+. %{_sysconfdir}/imapd-ssl
+if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then
+    sed s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ < %{_sysconfdir}/imapd-ssl > %{_sysconfdir}/imapd-ssl.new
+    mv -f %{_sysconfdir}/imapd-ssl.new %{_sysconfdir}/imapd-ssl
+    chmod 640 %{_sysconfdir}/imapd-ssl
+fi
+
 %triggerin -n %{name}-common -- %{name}-common < 3.0.5
 /sbin/chkconfig --del authdaemon
 if [ -f /var/lock/subsys/authdaemon ]; then
@@ -386,6 +395,14 @@ if [ -f /var/lock/subsys/courier-pop3 ]; then
        /etc/rc.d/init.d/courier-pop3 restart >&2
 fi
 
+%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6
+. %{_sysconfdir}/pop3d-ssl
+if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then
+    sed s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ < %{_sysconfdir}/pop3d-ssl > %{_sysconfdir}/pop3d-ssl.new
+    mv -f %{_sysconfdir}/pop3d-ssl.new %{_sysconfdir}/pop3d-ssl
+    chmod 640 %{_sysconfdir}/pop3d-ssl
+fi
+
 %post authldap
 if ps -A |grep -q authdaemond.lda; then
         %{_libexecdir}/authlib/authdaemond stop
@@ -437,7 +454,8 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/imapd-ssl
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/imapd.cnf
 %attr(754,root,root) /etc/rc.d/init.d/courier-imap
-%attr(750,daemon,daemon) %dir %{_sysconfdir}/shared
+%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared
+%attr(755,daemon,daemon) %dir %{_sysconfdir}/shared.tmp
 %attr(755,root,root) %{_bindir}/imapd
 %attr(755,root,root) %{_bindir}/maildiracl
 %attr(755,root,root) %{_bindir}/maildirkw
@@ -458,6 +476,7 @@ fi
 %attr(700,root,root) /var/lib/authdaemon
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_certsdir}
+%attr(700,daemon,daemon) %dir %{_localstatedir}
 %dir %{_libexecdir}
 %dir %{_libexecdir}/authlib
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/authdaemonrc