perl 5.38.0 rebuild

[packages/courier.git] / courier.spec

diff --git a/courier.spec b/courier.spec
index 3dd930bacbb3b7cb525834019bf1c4256fcef3c2..8fff505273486ba71a43288e0128e6c86ea76789 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -12,12 +12,12 @@
 Summary:       Courier mail server
 Summary(pl.UTF-8):     Serwer poczty Courier
 Name:          courier
-Version:       0.78.2
-Release:       1
+Version:       1.2.2
+Release:       2
 License:       GPL v3 with OpenSSL exception
 Group:         Networking/Daemons
-Source0:       http://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: 6e8e8617cccc152c2b03f8faf3e5d2e7
+Source0:       https://downloads.sourceforge.net/courier/%{name}-%{version}.tar.bz2
+# Source0-md5: 4f27683022efc180a8a46cdbca99d3b9
 Patch1:                %{name}-withoutfam.patch
 Patch2:                %{name}-maildir.patch
 Patch3:                %{name}-sendmail_dir.patch
@@ -27,9 +27,9 @@ Patch6:               %{name}-filterbindir.patch
 URL:           http://www.courier-mta.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: courier-authlib-devel >= 0.61
+BuildRequires: courier-authlib-devel >= 0.71
 %{?with_socks:BuildRequires:   courier-sox-devel}
-BuildRequires: courier-unicode-devel >= 2.0
+BuildRequires: courier-unicode-devel >= 2.1
 BuildRequires: db-devel
 BuildRequires: expect
 %{?with_fam:BuildRequires:     fam-devel}
@@ -39,15 +39,15 @@ BuildRequires:      gnupg
 %{?with_gnutls:BuildRequires:  gnutls-devel >= 3.0}
 %{?with_gnutls:BuildRequires:  libgcrypt-devel}
 %{?with_gnutls:BuildRequires:  libgpg-error-devel}
-BuildRequires: libidn-devel >= 0.0.0
+BuildRequires: libidn2-devel >= 0.0.0
 BuildRequires: libstdc++-devel >= 6:4.7
-BuildRequires: libtool >= 2:1.5
+BuildRequires: libtool >= 2:2
 BuildRequires: mailcap
 BuildRequires: openldap-devel >= 2.3.0
 %{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
 BuildRequires: openssl-tools >= 0.9.7d
 BuildRequires: pam-devel
-BuildRequires: pcre-devel
+BuildRequires: pcre2-8-devel
 BuildRequires: perl-devel >= 5
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.268
@@ -56,9 +56,12 @@ BuildRequires:       sysconftool
 Requires(post,preun):  /sbin/chkconfig
 # even if using OpenSSL libraries, Courier uses certtool from GnuTLS
 Requires:      /usr/bin/certtool
+Requires:      courier-authlib >= 0.71
+Requires:      courier-unicode >= 2.1
 Requires:      rc-scripts
 Provides:      smtpdaemon
 Obsoletes:     smtpdaemon
+Conflicts:     cone < 1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _localstatedir  /var/spool/courier
@@ -312,6 +315,8 @@ Alias /webmail %{_imagedir}
 </Directory>
 EOF
 
+%{__rm} libs/pcp/m4/ltversion.m4
+
 %build
 %{__libtoolize}
 # Change Makefile.am files and force recreate Makefile.in's.
@@ -323,7 +328,7 @@ find -type f -a -name configure.ac | while read FILE; do
                sed -i -e '/_[L]DFLAGS=-static/d' Makefile.am
        fi
 
-       %{__aclocal}
+       %{__aclocal} $(test ! -d m4 || echo -I m4)
        %{__autoconf}
        if grep -q AC_CONFIG_HEADER configure.ac; then
                %{__autoheader}
@@ -352,6 +357,7 @@ done
        --with-mailgroup=daemon \
        --with-mailuid=2 \
        --with-mailuser=daemon \
+       --with-notice=unicode \
        %{!?with_socks:--without-socks}
 
 %{__make} -j1
@@ -367,7 +373,7 @@ install -d -p $RPM_BUILD_ROOT/etc/{cron.hourly,pam.d,rc.d/init.d} \
        DESTDIR=$RPM_BUILD_ROOT
 
 # fix pam problem
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.authpam
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/*.authpam
 for X in imap esmtp pop3 webmail calendar
 do
        cat > $RPM_BUILD_ROOT/etc/pam.d/$X <<'EOF'
@@ -386,6 +392,9 @@ done
 %{__mv} $RPM_BUILD_ROOT%{_libexecdir}/courier/webmail/webadmin \
        $RPM_BUILD_ROOT%{_cgibindir}/webadmin
 
+# noinst program (as of 1.1.8)
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/maildirwatch.1
+
 # install a cron job to clean out webmail's cache
 install libs/sqwebmail/cron.cmd $RPM_BUILD_ROOT/etc/cron.hourly/courier-webmail-cleancache
 
@@ -645,7 +654,6 @@ fi
 %{_docdir}/courier/couriertls.html
 %{_docdir}/courier/deliverquota.html
 %{_docdir}/courier/documentation.html
-%{_docdir}/courier/download.html
 %{_docdir}/courier/index.html
 %{_docdir}/courier/install.html
 %{_docdir}/courier/layout.html
@@ -921,6 +929,7 @@ fi
 %attr(700,daemon,daemon) %dir %{_sysconfdir}/webadmin/added
 %attr(700,daemon,daemon) %dir %{_sysconfdir}/webadmin/removed
 %attr(400,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/password
+%attr(400,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/restartauthcmd
 %attr(644,daemon,daemon) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/webadmin/unsecureok
 %attr(755,root,root) %{_datadir}/courier/courierwebadmin/admin-main.pl
 %attr(755,root,root) %{_datadir}/courier/courierwebadmin/admin-save.pl
@@ -979,7 +988,7 @@ fi
 
 %files webmlm
 %defattr(644,root,root,755)
-%attr(700,daemon,daemon) %dir %{_sysconfdir}/webmlmrc
+%attr(700,daemon,daemon) %{_sysconfdir}/webmlmrc
 %attr(755,root,root) %{_bindir}/webmlmd
 %attr(755,root,root) %{_bindir}/webmlmd.rc
 %dir %{_libexecdir}/courier/webmail