require shapelib on fedora only

This commit is contained in:
Pavel Zhukov 2021-02-17 11:55:39 +01:00
parent 4fbf4104bd
commit 0bfe660def

View File

@ -14,7 +14,7 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.2.4 Version: 3.2.4
Release: 6%{?dist} Release: 7%{?dist}
%define ssl_pem_file_prefix /etc/pki/%name/%name %define ssl_pem_file_prefix /etc/pki/%name/%name
@ -89,12 +89,12 @@ BuildRequires: perl(Pod::Html)
%if 0%{?fedora} && 0%{?fedora} >= 0 %if 0%{?fedora} && 0%{?fedora} >= 0
BuildRequires: clamav-devel BuildRequires: clamav-devel shapelib-devel
%endif %endif
BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel BuildRequires: CUnit-devel cyrus-sasl-devel glib2-devel
BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel BuildRequires: jansson-devel krb5-devel libical-devel libicu-devel
BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel BuildRequires: libnghttp2-devel libxml2-devel mariadb-devel net-snmp-devel
BuildRequires: openldap-devel openssl-devel libpq-devel shapelib-devel BuildRequires: openldap-devel openssl-devel libpq-devel
BuildRequires: sqlite-devel xapian-core-devel BuildRequires: sqlite-devel xapian-core-devel
# Miscellaneous modules needed for 'make check' to function: # Miscellaneous modules needed for 'make check' to function:
@ -231,7 +231,7 @@ This package contains Perl libraries used to interface with Cyrus IMAPd.
%prep %prep
%autosetup -p1 %autosetup -p1
echo %version > VERSION echo %version > VERSION
# Install the Fedora-specific documentation file # Install the Fedora-specific documentation file
@ -540,7 +540,7 @@ tests=(
# preserving 20 nested folder deletions has been removed. # preserving 20 nested folder deletions has been removed.
Delete.repeated_delete Delete.repeated_delete
## FIXME failed on 3.2 only ## FIXME failed on 3.2 only
Rename.intermediate_cleanup Rename.intermediate_cleanup
) )
@ -690,6 +690,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog %changelog
* Wed Feb 17 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-7
- Require shapelib on Fedoras only
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.2.4-6 * Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 3.2.4-6
- rebuild for libpq ABI fix rhbz#1908268 - rebuild for libpq ABI fix rhbz#1908268
@ -719,7 +722,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 13 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-9 * Mon Jul 13 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-9
- Fix FTBFS caused by weak certificates (#1852137) - Fix FTBFS caused by weak certificates (#1852137)
* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.13-8 * Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.13-8
- Perl 5.32 rebuild - Perl 5.32 rebuild
@ -731,7 +734,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
- Add missed dependencies (#1819685) - Add missed dependencies (#1819685)
* Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-5 * Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-5
- Specify version of cyrus-imapd for utils to avoid the need to test interoperability - Specify version of cyrus-imapd for utils to avoid the need to test interoperability
* Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-4 * Thu Apr 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.0.13-4
- Fix pem files permission - Fix pem files permission