From 34e1a93ccbe2f553f9c3bfd15711d3742419dcdd Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 9 Jan 2018 20:46:26 -0600 Subject: [PATCH] Re-enable clamav and mysql support. Since both clamav and mysql are built with openssl 1.1 now, they can be re-enabled here. --- cyrus-imapd.spec | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 0e007ba..c006c3e 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -9,7 +9,7 @@ Name: cyrus-imapd Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} %define ssl_pem_file /etc/pki/%name/%name.pem @@ -78,24 +78,17 @@ Source92: patch-cassandane-fix-annotator ## https://github.com/cyrusimap/cassandane/commit/2221787bf86cb886b878eb844e81829165f3ed15 Source93: patch-cassandane-unknown_calendars -# Dependency notes: -# * clamav-devel and mariadb-devel removed because they both depend on -# compat-openssl. -# * As of 2017-05-22, libical 2.1 has not actually been released. The -# configure script will always produce the following message: -# configure: Your version of libical can not support patching iCalendar -# objects. Consider upgrading to libical >= 2.1 - BuildRequires: autoconf automake bison flex gcc gcc-c++ git groff libtool BuildRequires: pkgconfig systemd transfig BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) BuildRequires: perl(Pod::Html) -BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel jansson-devel -BuildRequires: krb5-devel libical-devel libnghttp2-devel libxml2-devel -BuildRequires: net-snmp-devel openldap-devel openssl-devel postgresql-devel -BuildRequires: shapelib-devel sqlite-devel xapian-core-devel +BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel +BuildRequires: jansson-devel krb5-devel libical-devel libnghttp2-devel +BuildRequires: libxml2-devel mariadb-devel net-snmp-devel openldap-devel +BuildRequires: openssl-devel postgresql-devel shapelib-devel sqlite-devel +BuildRequires: xapian-core-devel # Miscellaneous modules needed for 'make check' to function: BuildRequires: cyrus-sasl-plain cyrus-sasl-md5 @@ -639,6 +632,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog +* Tue Jan 09 2018 Jason L Tibbitts III - 3.0.5-3 +- Re-enable clamav and mariadb support as those are now built with openssl 1.1. + * Thu Jan 04 2018 Jason L Tibbitts III - 3.0.5-2 - Reorganize some test exclusions so things build on all releases.