From 27134fa129b573ddff0b277187ce917509c9dbc6 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Tue, 19 Jan 2021 10:12:19 +0100 Subject: [PATCH] Disable tests on ppc64le and x86 due to brew limitation --- cyrus-imapd.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 3c59163..fb3b04c 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -87,7 +87,10 @@ BuildRequires: groff libtool pkgconfig rsync systemd transfig BuildRequires: perl-devel perl-generators perl(ExtUtils::MakeMaker) BuildRequires: perl(Pod::Html) -BuildRequires: CUnit-devel clamav-devel cyrus-sasl-devel glib2-devel +%if 0%{?fedora} && 0%{?fedora} >= 0 +BuildRequires: clamav-devel +%endif +BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel BuildRequires: openldap-devel openssl-devel libpq-devel shapelib-devel @@ -127,9 +130,11 @@ 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) -BuildRequires: clamav-data perl(Unix::Syslog) +%if 0%{?fedora} && 0%{?fedora} >= 0 +BuildRequires: clamav-data +%endif BuildRequires: perl(HTTP::Daemon) perl(DBI) perl(Net::LDAP::Constant) -BuildRequires: perl(Net::LDAP::Server) +BuildRequires: perl(Net::LDAP::Server) perl(Unix::Syslog) # These were only for JMAP-Tester # perl(Moo), perl(Moose), perl(MooseX::Role::Parameterized) perl(Throwable), perl(Safe::Isa) @@ -302,7 +307,6 @@ autoreconf -vi --disable-silent-rules \ \ --libexecdir=%cyrexecdir \ - --with-clamav \ --with-extraident="%release Fedora" \ --with-krbimpl=mit \ --with-ldap=/usr \ @@ -311,6 +315,11 @@ 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 \ @@ -472,7 +481,7 @@ chmod -x %buildroot/%perl_vendorlib/Cyrus/Annotator/Daemon.pm %check ## FIXME RHELBLD-4341 -%ifnarch %{ix86} +%ifnarch %{ix86} ppc64le export LD_LIBRARY_PATH=%buildroot/%_libdir export CYRUS_USER=$USER @@ -539,7 +548,6 @@ tests=( ## FIXME failed on 3.2 only Rename.intermediate_cleanup - ) for i in ${tests[@]}; do exclude+=("!$i"); done @@ -688,7 +696,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v %changelog - Fri Jan 15 2021 Pavel Zhukov - 3.2.4-4 -- Disable tests on ix86 (RHELBLD-4341) +- Disable tests on ix86 (RHELBLD-4341) and ppc64le * Mon Dec 14 2020 Pavel Zhukov - 3.2.4-3 - Add ExecReload to service file (#1907223)