From 70e36f28d3cdb4b6ca91acb82236b7eafb9445f7 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 8 Jan 2018 13:40:19 +0100 Subject: [PATCH] remove tcp_wrappers on Fedora 28 and later (#1518761) use use mariadb-connector-c-devel instead of mysql-devel on Fedora 28 and later (#1493624) --- dovecot.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dovecot.spec b/dovecot.spec index 6f11de1..93fd84c 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -5,7 +5,7 @@ Name: dovecot Epoch: 1 Version: 2.2.33.2 %global prever %{nil} -Release: 1%{?dist} +Release: 2%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 Group: System Environment/Daemons @@ -40,12 +40,16 @@ BuildRequires: openssl-devel, pam-devel, zlib-devel, bzip2-devel, libcap-devel BuildRequires: libtool, autoconf, automake, pkgconfig BuildRequires: sqlite-devel BuildRequires: postgresql-devel +%if %{?fedora}0 < 280 BuildRequires: mysql-devel +BuildRequires: tcp_wrappers-devel +%else +BuildRequires: mariadb-connector-c-devel +%endif BuildRequires: openldap-devel BuildRequires: krb5-devel BuildRequires: quota-devel BuildRequires: xz-devel -BuildRequires: tcp_wrappers-devel # gettext-devel is needed for running autoconf because of the # presence of AM_ICONV @@ -161,7 +165,9 @@ autoreconf -I . -fiv #required for aarch64 support --with-sqlite \ --with-zlib \ --with-libcap \ +%if %{?fedora}0 < 280 --with-libwrap \ +%endif %if %{?fedora}0 > 150 || %{?rhel}0 >60 --with-lucene \ %endif @@ -490,6 +496,10 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Mon Jan 08 2018 Michal Hlavinka - 1:2.2.33.2-2 +- remove tcp_wrappers on Fedora 28 and later (#1518761) +- use use mariadb-connector-c-devel instead of mysql-devel on Fedora 28 and later (#1493624) + * Tue Oct 24 2017 Michal Hlavinka - 1:2.2.33.2-1 - dovecot updated to 2.2.33.2 - doveadm: Fix crash in proxying (or dsync replication) if remote is