File dmm.patch of Package courier-imap

Index: courier-imap.spec
===================================================================
--- courier-imap.spec     (revision 22) 
+++ courier-imap.spec     (working copy) 
@@ -11,11 +11,12 @@
 # norootforbuild
 
 Name:           courier-imap
-BuildRequires:  courier-authlib-devel fam-devel gcc-c++ libstdc++-devel openssl-devel postfix
+BuildRequires:  courier-authlib-devel fam-devel gcc-c++ libstdc++-devel openssl-devel postfix update-alternatives
+PreReq:         update-alternatives
 URL:            http://www.courier-mta.org/imap/
 Summary:        An IMAP and POP3 Server for Maildir MTAs
 Version:        4.1.2
-Release:        33
+Release:        35
 License:        GNU General Public License (GPL)
 Conflicts:      imap qpopper
 Group:          Productivity/Networking/Email/Servers
@@ -134,9 +135,22 @@
 #firewall script
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/
 install -m 644 %{S:8} $RPM_BUILD_ROOT%{_sysconfdir}/SuSEfirewall2.d/services/%{name}
+# alternatives
+%{__mv} %{buildroot}%{_bindir}/maildirmake %{buildroot}%{_bindir}/maildirmake.courier
+%{__mv} %{buildroot}%{_mandir}/man1/maildirmake.1 %{buildroot}%{_mandir}/man1/maildirmake.courier.1
+%{__mv} %{buildroot}%{_bindir}/deliverquota %{buildroot}%{_bindir}/deliverquota.courier
+%{__mv} %{buildroot}%{_mandir}/man8/deliverquota.8 %{buildroot}%{_mandir}/man8/deliverquota.courier.8
 
 %post
 %{_datadir}/courier-imap/sysconftool `%{__cat} %{_datadir}/courier-imap/configlist` >/dev/null
+
+update-alternatives --install %{_bindir}/maildirmake maildirmake %{_bindir}/maildirmake.courier 2 \
+  --slave %{_mandir}/man1/maildirmake.1.gz maildirmake.1 %{_mandir}/man1/maildirmake.courier.1.gz
+update-alternatives --auto maildirmake
+
+update-alternatives --install %{_bindir}/deliverquota deliverquota %{_bindir}/deliverquota.courier 2 \
+  --slave %{_mandir}/man8/deliverquota.8.gz deliverquota.8 %{_mandir}/man8/deliverquota.courier.8.gz
+update-alternatives --auto deliverquota
 
 %preun
 %stop_on_removal courier-imap courier-imap-ssl courier-pop courier-pop-ssl
@@ -150,6 +164,8 @@
   rm -f %{_localstatedir}/pop3d-ssl.pid
   rm -f %{_localstatedir}/pop3d.pid.lock
   rm -f %{_localstatedir}/pop3d-ssl.pid.lock
+  update-alternatives --remove maildirmake {_bindir}/maildirmake.courier
+  update-alternatives --remove deliverquota {_bindir}/deliverquota.courier
 fi
 exit 0
 
@@ -186,6 +202,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog -n courier-imap
+* Thu Nov 22 2007 - vincent@dauphin-mm.nl
+- use update-alternatives for conflicting tools with maildrop
 * Mon Feb 12 2007 - mskibbe@suse.de
 - fix mkpop3dcert and mkimapdcert. Now they use pem files from
   /etc/courier-imap/