From b177185281714e11448717fb904d99290fe72486 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Jun 05 2017 18:33:11 +0000
Subject: Remove clamav support and reduce build disk use.


Remove the build dependency on clamav-devel so that cyr_virusscan and
such aren't built.  Clamav still uses the old openssl libraries, and so
cyr_virusscan would occasionally segfault.  This caused a Cassandane
failure on ppc64.  (I have no idea why it only failed there.)

Add --cleanup to the testrunner.pl command line to keep disk usage
lower,  This may help to fix an intermittent test failure which was
potentially related to disk space.

Bump to 3.0.1-3.

---

diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 40e960d..88b693c 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -9,7 +9,7 @@
 
 Name: cyrus-imapd
 Version: 3.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %define ssl_pem_file /etc/pki/%name/%name.pem
 
@@ -81,11 +81,10 @@ BuildRequires: pkgconfig systemd tcp_wrappers transfig
 BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Pod::Html)
 
-BuildRequires: clamav-devel CUnit-devel cyrus-sasl-devel glib2-devel
-BuildRequires: jansson-devel krb5-devel libical-devel libnghttp2-devel
-BuildRequires: libxml2-devel net-snmp-devel openldap-devel
-BuildRequires: openssl-devel postgresql-devel shapelib-devel sqlite-devel
-BuildRequires: xapian-core-devel
+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
 
 # Miscellaneous modules needed for 'make check' to function:
 BuildRequires: cyrus-sasl-plain cyrus-sasl-md5
@@ -489,7 +488,6 @@ for i in ${tests[@]}; do exclude+=("!JMAPMail.$i"); done
 %ifarch ppc64 s390x
 # Some failures only on little-endian machines for some reason
 tests=(
-    ClamAV.remove_infected  # Only on ppc64, actually
     JMAPContacts.getcontactgroupupdates
     JMAPContacts.getcontactupdates
     JMAPMail.getmailboxupdates
@@ -529,7 +527,7 @@ for i in ${tests[@]}; do exclude+=("!$i"); done
 %endif
 
 # Add -vvv for too much output
-./testrunner.pl %{?_smp_mflags} -f pretty ${exclude[@]} 2>&1
+./testrunner.pl %{?_smp_mflags} --cleanup -f pretty ${exclude[@]} 2>&1
 
 
 %pre
@@ -623,6 +621,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Fri Jun 02 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-3
+- Remove clamav from build requirements.
+- Add --cleanup to Cassandane call to hopefully reduce build disk usage.
+
 * Fri Jun 02 2017 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.1-2
 - Add patch to fix up some endianness issues.
 - Enable both test suites on all architectures.