Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/cyrus-imapd.git#ef1a668fad58b94922270904294f844654f1d248

cyrus-imapd.spec

@@ -14,7 +14,7 @@
 
 Name: cyrus-imapd
 Version: 3.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -87,6 +87,7 @@ BuildRequires: groff libtool pkgconfig rsync systemd transfig
 BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Pod::Html)
 
+
 %if 0%{?fedora} && 0%{?fedora}  >= 0
 BuildRequires: clamav-devel
 %endif
@@ -130,11 +131,10 @@ BuildRequires: perl(Test::Unit::TestCase) perl(Test::Unit::TestRunner)
 BuildRequires: perl(Time::HiRes) perl(URI) perl(URI::Escape) perl(User::pwent)
 BuildRequires: perl(utf8) perl(vars) perl(warnings) perl(XML::DOM)
 BuildRequires: perl(XML::Generator) perl(XML::Spice)
-%if 0%{?fedora} && 0%{?fedora}  >= 0
+BuildRequires: clamav-data perl(Unix::Syslog)
-BuildRequires: clamav-data
-%endif
 BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant)
-BuildRequires: perl(Net::LDAP::Server) perl(Unix::Syslog)
+BuildRequires: perl(Net::LDAP::Server)
+BuildRequires: make
 
 # These were only for JMAP-Tester
 # perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa)
@@ -307,6 +307,7 @@ autoreconf -vi
     --disable-silent-rules \
     \
     --libexecdir=%cyrexecdir \
+    --with-clamav \
     --with-extraident="%release Fedora" \
     --with-krbimpl=mit \
     --with-ldap=/usr \
@@ -315,11 +316,6 @@ autoreconf -vi
     --with-pgsql \
     --with-perl=%__perl \
     --with-snmp \
-%if 0%{?fedora} && 0%{?fedora}  >= 0
-    --with-clamav \
-%else
-    --without-clamav \
-%endif
     --with-syslogfacility=MAIL \
     \
     --enable-autocreate \
@@ -480,8 +476,6 @@ chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm
 
 
 %check
-## FIXME RHELBLD-4341
-%ifnarch %{ix86} ppc64le
 export LD_LIBRARY_PATH=%buildroot/%_libdir
 export CYRUS_USER=$USER
 
@@ -548,6 +542,7 @@ tests=(
 
     ## FIXME failed on 3.2 only 
     Rename.intermediate_cleanup
+
 )
 for i in ${tests[@]}; do exclude+=("!$i"); done
 
@@ -576,7 +571,7 @@ exclude+=("!Master.maxforkrate")
 
 # Add -vvv for too much output
 ./testrunner.pl %{?_smp_mflags} -v -f pretty ${exclude[@]} 2>&1
-%endif
+
 
 %pre
 # Create 'cyrus' user on target host
@@ -695,8 +690,11 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
-- Fri Jan 15 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-5
-- Disable tests on ix86 (RHELBLD-4341) and ppc64le 
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jan 12 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
+- Drop clamav BR for eln
 
 * Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3
 - Add ExecReload to service file (#1907223)