- updated to 1.3.2

- partially rewrited
- separated to 3 packages

Changed files:
    courier-imap.spec -> 1.19

diff --git a/courier-imap.spec b/courier-imap.spec
index 4889e8131ddb1d5f5b419f517dad03482fbdef14..4448b0581639fe68171a165134c708d8c0e12ada 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,21 +1,26 @@
-Summary:       Courier-IMAP 0.18 IMAP server
+Summary:       Courier-IMAP server
 Name:          courier-imap
-Version:       0.22
-Release:       2
+Version:       1.3.2
+Release:       1
 License:       GPL
-Group:         Applications/Mail
-Group(pl):     Aplikacje/Poczta
-Group(pt):     Aplicações/Correio Eletrônico
+Group:         Networking/Daemons
 Source0:       http://www.inter7.com/courierimap/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
-Source2:       %{name}.pamd
-Source3:       %{name}.sysconfig
+Source2:       %{name}-pop3.init
+Source3:       %{name}-authdaemon.init
+Source4:       %{name}.pamd
+Source5:       %{name}-pop3.pamd
+Source6:       %{name}.sysconfig
+Source7:       %{name}-pop3.sysconfig
+Source8:       %{name}-authdaemon.sysconfig
 URL:           http://www.inter7.com/courierimap/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires:      %{name}-common = %{version}
 Provides:      imapdaemon
 Obsoletes:     imapdaemon
 
 %define                _libexecdir     /usr/lib/courier-imap
+%define                _sysconfdir     /etc/courier-imap
 
 %description
 Courier-IMAP is an IMAP server for Maildir mailboxes.
@@ -23,11 +28,34 @@ Courier-IMAP is an IMAP server for Maildir mailboxes.
 %description -l pl
 Courier-IMAP jest serwerem IMAP dla skrzynek pocztowych Maildir.
 
+%package common
+Summary:       Common files for imap and pop daemons.
+Group:         Networking/Daemons
+
+%description common
+Common files for imap and pop daemons.
+
+%description -l pl common
+Pliki wspólne dla serwerów imap i pop.
+
+%package pop3
+Summary:       Courier-IMAP POP3 Server
+Group:         Networking/Daemons
+Requires:       %{name}-common = %{version}
+Provides:      pop3daemon
+Obsoletes:     pop3daemon
+
+%description pop3
+Courier-IMAP POP3 is an POP3 server for Maildir mailboxes.
+
+%description -l pl pop3
+Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
+
 %prep
 %setup -q
 %build
 %configure \
-       --with-authvchkpw
+       --with-authdaemonvar=/var/lib/authdaemon
 %{__make}
 
 %install
@@ -37,13 +65,32 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security,sysconfig}
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/imap
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/courier-imap
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-pop3
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/authdaemon
+
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/imap
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/pop3
+
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/courier-imap
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/courier-imap-pop3
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/authdaemon
+
+rm -rf  $RPM_BUILD_ROOT%{_mandir}/man8/{authcram,authpam,authpwd,authshadow,authuserdb,authvchkpw,pw2userdb,vchkpw2userdb,authdaemon,authdaemond,authldap,authmysql}.8 \
+       $RPM_BUILD_ROOT%{_sbindir}/{*db,mk*cert}
 
 mv imap/README README.imap
 mv maildir/README.maildirquota.txt README.maildirquota
 
-rm -rf $RPM_BUILD_ROOT%{_mandir}/man8/{authcram,authpam,authpwd,authshadow,authuserdb,authvchkpw,pw2userdb,vchkpw2userdb}.8
+mv $RPM_BUILD_ROOT%{_sysconfdir}/authdaemonrc.dist \
+       $RPM_BUILD_ROOT%{_sysconfdir}/authdaemonrc
+mv $RPM_BUILD_ROOT%{_sysconfdir}/authldaprc.dist \
+       $RPM_BUILD_ROOT%{_sysconfdir}/authldaprc
+mv $RPM_BUILD_ROOT%{_sysconfdir}/authmysqlrc.dist \
+       $RPM_BUILD_ROOT%{_sysconfdir}/authmysqlrc
+mv $RPM_BUILD_ROOT%{_datadir}/*db \
+       $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_datadir}/mk*cert \
+       $RPM_BUILD_ROOT%{_sbindir}
 
 echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authcram.8
 echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authpam.8
@@ -51,12 +98,16 @@ echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authpwd.8
 echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authshadow.8
 echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authuserdb.8
 echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authvchkpw.8
+echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemon.8
+echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authdaemond.8
+echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authmysql.8
+echo ".so authlib.8" >$RPM_BUILD_ROOT%{_mandir}/man8/authldap.8
 echo ".so makeuserdb.8" >$RPM_BUILD_ROOT%{_mandir}/man8/pw2userdb.8
 echo ".so makeuserdb.8" >$RPM_BUILD_ROOT%{_mandir}/man8/vchkpw2userdb.8
 
 gzip -9nf README* imap/BUGS AUTHORS COPYING
 
-touch $RPM_BUILD_ROOT/etc/security/blacklist.courier-imap
+touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
 %post
 /sbin/chkconfig --add courier-imap
@@ -75,23 +126,87 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del courier-imap
 fi
 
+%post common
+/sbin/chkconfig --add authdaemon
+
+if [ -f /var/lock/subsys/authdaemon ]; then
+       /etc/rc.d/init.d/authdaemon restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/authdaemon start\" to start courier-imap authdaemon."
+fi
+
+%preun common
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/authdaemon ]; then
+               /etc/rc.d/init.d/authdaemon stop >&2
+       fi
+
+       /sbin/chkconfig --del authdaemon
+fi
+
+%post pop3
+/sbin/chkconfig --add courier-imap-pop3
+
+if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
+       /etc/rc.d/init.d/courier-imap-pop3 restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/courier-imap-pop3 start\" to start courier-imap pop3 daemon."
+fi
+
+%preun pop3
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
+               /etc/rc.d/init.d/courier-imap-pop3 stop >&2
+       fi
+       /sbin/chkconfig --del courier-imap
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644,root,root,755)
-%doc {AUTHORS,COPYING,imap/BUGS,README,README.imap,README.maildirquota}.gz
 %attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/imap
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.courier-imap
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.imap
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/courier-imap
 %attr(754,root,root) /etc/rc.d/init.d/courier-imap
+%{_sysconfdir}/imapd.cnf
+%attr(755,root,root) %{_bindir}/imapd
+%attr(755,root,root) %{_sbindir}/imaplogin
+%attr(755,root,root) %{_sbindir}/mkimapdcert
+
+%files common
+%defattr(644,root,root,755)
+%doc {AUTHORS,COPYING,imap/BUGS,README,README.imap,README.maildirquota}.gz
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/authdaemon
+%attr(754,root,root) /etc/rc.d/init.d/authdaemon
+%attr(750,root,root) %dir %{_sysconfdir}
 %dir %{_libexecdir}
 %dir %{_libexecdir}/authlib
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_libexecdir}/authlib/*
+%{_sysconfdir}/authdaemonrc
+%{_sysconfdir}/authldaprc
+%{_sysconfdir}/authmysqlrc
+%{_sysconfdir}/quotawarnmsg.example
+%attr(755,root,root) %{_bindir}/couriertls
+%attr(755,root,root) %{_bindir}/maildirmake
+%attr(755,root,root) %{_sbindir}/makeuserdb
+%attr(755,root,root) %{_sbindir}/pw2userdb
+%attr(755,root,root) %{_sbindir}/userdb
+%attr(755,root,root) %{_sbindir}/userdbpw
+%attr(755,root,root) %{_sbindir}/vchkpw2userdb
+%attr(755,root,root) %{_libexecdir}/authlib/authdaemon
+%attr(755,root,root) %{_libexecdir}/authlib/authdaemond.*
 %attr(755,root,root) %{_libexecdir}/couriertcpd
 %attr(755,root,root) %{_libexecdir}/deliverquota
 %attr(755,root,root) %{_libexecdir}/logger
 %attr(755,root,root) %{_libexecdir}/makedatprog
-%{_mandir}/*/*
+%{_mandir}/man*/*
+
+%files pop3
+%attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/pop3
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.pop3
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/courier-imap-pop3
+%attr(754,root,root) /etc/rc.d/init.d/courier-imap-pop3
+%attr(755,root,root) %{_bindir}/pop3d
+%attr(755,root,root) %{_sbindir}/mkpop3dcert
+%attr(755,root,root) %{_sbindir}/pop3login
+%{_sysconfdir}/pop3d.cnf