rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Re-enable clamav and mysql support.

Browse Source 
Since both clamav and mysql are built with openssl 1.1 now, they can be
re-enabled here.
This commit is contained in:
Jason Tibbitts 2018-01-09 20:46:26 -06:00
parent 397b5b4b0a
commit 34e1a93ccb
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cyrus-imapd.spec
View File

@ -9,7 +9,7 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.0.5 Version: 3.0.5
Release: 2%{?dist} Release: 3%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %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 ## https://github.com/cyrusimap/cassandane/commit/2221787bf86cb886b878eb844e81829165f3ed15
Source93: patch-cassandane-unknown_calendars 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: autoconf automake bison flex gcc gcc-c++ git groff libtool
BuildRequires: pkgconfig systemd transfig BuildRequires: pkgconfig systemd transfig
BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
BuildRequires: perl(Pod::Html) BuildRequires: perl(Pod::Html)
BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel jansson-devel BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel
BuildRequires: krb5-devel libical-devel libnghttp2-devel libxml2-devel BuildRequires: jansson-devel krb5-devel libical-devel libnghttp2-devel
BuildRequires: net-snmp-devel openldap-devel openssl-devel postgresql-devel BuildRequires: libxml2-devel mariadb-devel net-snmp-devel openldap-devel
BuildRequires: shapelib-devel sqlite-devel xapian-core-devel BuildRequires: openssl-devel postgresql-devel shapelib-devel sqlite-devel
BuildRequires: xapian-core-devel
# Miscellaneous modules needed for 'make check' to function: # Miscellaneous modules needed for 'make check' to function:
BuildRequires: cyrus-sasl-plain cyrus-sasl-md5 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 %changelog
* Tue Jan 09 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 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 <tibbs@math.uh.edu> - 3.0.5-2 * Thu Jan 04 2018 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.5-2
- Reorganize some test exclusions so things build on all releases. - Reorganize some test exclusions so things build on all releases.