- rediff patch, merge triggers for rpm4, rel 2

diff --git a/courier-imap-dirs.patch b/courier-imap-dirs.patch
index f20bc9c90d8dbbb9f5c5c20ab48db2ebad4fe7fe..f81fe9be00362bfb6862984ed3642e2127cfdb76 100644 (file)
--- a/courier-imap-dirs.patch
+++ b/courier-imap-dirs.patch
@@ -1,9 +1,11 @@
---- old/configure.ac   2004-06-12 01:38:04.000000000 +0000
-+++ new/configure.ac   2004-07-08 14:53:47.000000000 +0000
-@@ -234,5 +234,6 @@
-               pop3d.rc pop3d-ssl.rc
-               courier-imap.sysvinit courier-imap.spec index.html
+diff -urNp -x '*.orig' courier-imap-5.0.7.org/configure.ac courier-imap-5.0.7/configure.ac
+--- courier-imap-5.0.7.org/configure.ac        2019-03-27 22:34:04.000000000 +0100
++++ courier-imap-5.0.7/configure.ac    2021-10-23 00:10:21.114488946 +0200
+@@ -325,6 +325,7 @@ AC_CONFIG_FILES(Makefile dbobj.h dbobj.c
+               authconfig
+               courier-imap.spec
                INSTALL.html
 +              courier-imap courier-imap-ssl courier-pop3 courier-pop3-ssl
                packaging/suse/courier-imap.init
                packaging/systemd/courier-imap.sysvinit
+               packaging/systemd/courier-imap.service)

diff --git a/courier-imap.spec b/courier-imap.spec
index 56b489bc51a6845ddb8ebc3cbd040caec5433ee0..c9f3b59c8d9b5dfed35a313dfabe0bfad0b397a9 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -16,7 +16,7 @@ Summary:      Courier-IMAP server
 Summary(pl.UTF-8):     Serwer Courier-IMAP
 Name:          courier-imap
 Version:       5.0.7
-Release:       1
+Release:       2
 License:       GPL v3 with OpenSSL exception
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -330,7 +330,8 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del courier-pop3-ssl
 fi
 
-%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.5
+%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6
+# 3.0.5
 if [ -f /var/lib/openssl/certs/pop3d.pem ]; then
        echo
        echo pop3d.pem has been moved automatically to %{_certsdir}
@@ -354,7 +355,7 @@ if [ -f /etc/sysconfig/courier-pop3 ]; then
 fi
 %service courier-pop3 restart
 
-%triggerin -n %{name}-pop3 -- %{name}-pop3 < 3.0.6
+# 3.0.6
 . %{_sysconfdir}/pop3d-ssl
 if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then
        sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/pop3d-ssl