From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 1 Mar 2023 16:49:58 +0000 (+0100)
Subject: - updated to 5.2.2
X-Git-Tag: auto/th/courier-imap-5.2.2-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=3360fcf67d7c2a984657cda9a1778f57c0c02072;p=packages%2Fcourier-imap.git

- updated to 5.2.2
---

diff --git a/courier-imap-dirs.patch b/courier-imap-dirs.patch
index f81fe9b..38591af 100644
--- a/courier-imap-dirs.patch
+++ b/courier-imap-dirs.patch
@@ -1,9 +1,8 @@
-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-5.2.2.org/configure.ac	2019-03-27 22:34:04.000000000 +0100
++++ courier-imap-5.2.2/configure.ac	2021-10-23 00:10:21.114488946 +0200
+@@ -268,6 +268,7 @@ AC_CONFIG_FILES(Makefile dbobj.h dbobj.c
  		courier-imap.spec
+ 		courier-debuild
  		INSTALL.html
 +		courier-imap courier-imap-ssl courier-pop3 courier-pop3-ssl
  		packaging/suse/courier-imap.init
diff --git a/courier-imap.spec b/courier-imap.spec
index f803727..943c76d 100644
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -15,12 +15,12 @@
 Summary:	Courier-IMAP server
 Summary(pl.UTF-8):	Serwer Courier-IMAP
 Name:		courier-imap
-Version:	5.1.7
+Version:	5.2.2
 Release:	1
 License:	GPL v3 with OpenSSL exception
 Group:		Networking/Daemons
 Source0:	https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5:	0e4b448167199822c437eb861d320469
+# Source0-md5:	7f210160a19ec973ea39d9ef32e25053
 Source1:	%{name}.init
 Source2:	%{name}-ssl.init
 Source3:	%{name}-pop3.init
@@ -40,13 +40,13 @@ BuildRequires:	courier-authlib-devel >= 0.71.0
 %{?with_socks:BuildRequires:	courier-sox-devel}
 BuildRequires:	courier-unicode-devel >= 2.1
 BuildRequires:	db-devel
-BuildRequires:	libidn-devel >= 0.0.0
+BuildRequires:	libidn2-devel >= 0.0.0
 %{?with_fam:BuildRequires:	gamin-devel}
 %{?with_gnutls:BuildRequires:	gnutls-devel >= 3.0}
 %{?with_gnutls:BuildRequires:	libgcrypt-devel}
 %{?with_gnutls:BuildRequires:	libgpg-error-devel}
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libtool >= 2:2
 %{!?with_gnutls:BuildRequires:	openssl-devel >= 0.9.7d}
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
@@ -210,8 +210,6 @@ cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/pop3
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/mk{dhparams,imapdcert,pop3dcert}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/mk{dhparams,imapdcert,pop3dcert} $RPM_BUILD_ROOT%{_sbindir}
 
-cp -pf libs/imap/README README.imap
-
 # missing from make install
 cp -p libs/imap/courierpop3d.8 $RPM_BUILD_ROOT%{_mandir}/man8
 cp -p libs/tcpd/couriertls.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -393,7 +391,7 @@ fi
 
 %files common
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING INSTALL NEWS README README.imap libs/imap/{BUGS,ChangeLog} libs/maildir/README.maildirquota.txt
+%doc AUTHORS COPYING INSTALL NEWS README libs/imap/{BUGS,ChangeLog} libs/maildir/README.maildirquota.txt
 %attr(751,root,root) %dir %{_sysconfdir}
 %attr(750,root,root) %dir %{_certsdir}
 %attr(770,daemon,daemon) %dir %{_localstatedir}