- rel 0.1; new scripts need testing; pldized init scripts

[packages/courier-imap.git] / courier-imap.spec

diff --git a/courier-imap.spec b/courier-imap.spec
index 286a4e3a99df3119fe436e20ed49204e20a6e90e..24f75eb25f9f14c44a92bc21b8befb7147cf98d8 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,16 +1,18 @@
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       4.0.2
-Release:       3
+Version:       4.0.4
+Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 9061583ef8e7b3fd69ef77dbfc0656eb
+# Source0-md5: cb5a1d394e622fe2c5ea7bcab68c6286
 Source1:       %{name}.init
-Source2:       %{name}-pop3.init
-Source3:       %{name}.pamd
-Source4:       %{name}-pop3.pamd
+Source2:       %{name}-ssl.init
+Source3:       %{name}-pop3.init
+Source4:       %{name}-pop3-ssl.init
+Source5:       %{name}.pamd
+Source6:       %{name}-pop3.pamd
 Patch0:                %{name}-dirs.patch
 Patch1:                %{name}-certsdir.patch
 Patch2:                %{name}-maildir.patch
@@ -113,23 +115,29 @@ Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
 %patch2 -p1
 
 install %{SOURCE1} courier-imap.in
-install %{SOURCE2} courier-pop3.in
+install %{SOURCE2} courier-imap-ssl.in
+install %{SOURCE3} courier-pop3.in
+install %{SOURCE4} courier-pop3-ssl.in
 
 %build
-cp -f /usr/share/automake/config.sub .
-cp -f /usr/share/automake/config.sub maildir
 
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
+# Change Makefile.am files and force recreate Makefile.in's.
+OLDDIR=`pwd`
+find -type f -a \( -name configure.in -o -name configure.ac \) | while read FILE; do
+        cd "`dirname "$FILE"`"
 
-cd imap
-%{__aclocal}
-%{__autoconf}
-ln -s ../ltmain.sh .
-%{__automake}
-cd ..
+        if [ -f Makefile.am ]; then
+                sed -i -e '/_LDFLAGS=-static/d' Makefile.am
+        fi
+
+        %{__libtoolize}
+        %{__aclocal}
+        %{__autoconf}
+        %{__autoheader}
+        %{__automake}
+
+        cd "$OLDDIR"
+done
 
 %configure \
        --with-db=db \
@@ -147,9 +155,11 @@ install -d $RPM_BUILD_ROOT{/etc/{pam.d,rc.d/init.d,security},%{_certsdir}}
        DESTDIR=$RPM_BUILD_ROOT
 
 install courier-imap $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap
+install courier-imap-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-imap-ssl
 install courier-pop3 $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/imap
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/pop3
+install courier-pop3-ssl $RPM_BUILD_ROOT/etc/rc.d/init.d/courier-pop3-ssl
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/imap
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3
 
 rm -rf $RPM_BUILD_ROOT%{_sbindir}/mk*cert
 
@@ -180,6 +190,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add courier-imap
+/sbin/chkconfig --add courier-imap-ssl
 
 if [ -f /var/lock/subsys/courier-imap ]; then
        /etc/rc.d/init.d/courier-imap restart >&2
@@ -187,6 +198,12 @@ else
        echo "Run \"/etc/rc.d/init.d/courier-imap start\" to start courier-imap daemon."
 fi
 
+if [ -f /var/lock/subsys/courier-imap-ssl ]; then
+       /etc/rc.d/init.d/courier-imap-ssl restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/courier-imap-ssl start\" to start courier-imap-ssl daemon."
+fi
+
 %preun
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/courier-imap ]; then
@@ -195,6 +212,14 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del courier-imap
 fi
 
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/courier-imap-ssl ]; then
+               /etc/rc.d/init.d/courier-imap-ssl stop >&2
+       fi
+       /sbin/chkconfig --del courier-imap-ssl
+fi
+
+
 %triggerin -- %{name} < 3.0.5
 if [ -f /var/lib/openssl/certs/imapd.pem ]; then
        echo
@@ -253,6 +278,7 @@ echo
 
 %post pop3
 /sbin/chkconfig --add courier-pop3
+/sbin/chkconfig --add courier-pop3-ssl
 /sbin/chkconfig --del courier-imap-pop3 >/dev/null 2>&1 || :
 if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
        /etc/rc.d/init.d/courier-imap-pop3 stop >&2
@@ -263,12 +289,22 @@ else
        echo "Run \"/etc/rc.d/init.d/courier-pop3 start\" to start courier-pop3 daemon."
 fi
 
+if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
+       /etc/rc.d/init.d/courier-pop3-ssl restart >&2
+else
+       echo "Run \"/etc/rc.d/init.d/courier-pop3-ssl start\" to start courier-pop3-ssl daemon."
+fi
+
 %preun pop3
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/courier-pop3 ]; then
                /etc/rc.d/init.d/courier-pop3 stop >&2
        fi
        /sbin/chkconfig --del courier-pop3
+        if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
+                /etc/rc.d/init.d/courier-pop3-ssl stop >&2
+        fi
+        /sbin/chkconfig --del courier-pop3-ssl
 fi
 
 %triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.5
@@ -312,6 +348,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd-ssl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/imapd.cnf
 %attr(754,root,root) /etc/rc.d/init.d/courier-imap
+%attr(754,root,root) /etc/rc.d/init.d/courier-imap-ssl
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/shared
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/shared.tmp
 %attr(755,root,root) %{_bindir}/imapd
@@ -360,6 +397,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pop3d-ssl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pop3d.cnf
 %attr(754,root,root) /etc/rc.d/init.d/courier-pop3
+%attr(754,root,root) /etc/rc.d/init.d/courier-pop3-ssl
 %attr(755,root,root) %{_bindir}/pop3d
 %attr(755,root,root) %{_sbindir}/mkpop3dcert
 %attr(755,root,root) %{_sbindir}/pop3login