From 2860368c09267a07a2173ffe1b4d987fced8dfed Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 18 Jan 2021 14:33:47 +0100 Subject: [PATCH] fix multilib issues --- dovecot.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dovecot.spec b/dovecot.spec index 7672068..02862e0 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -5,7 +5,7 @@ Name: dovecot Epoch: 1 Version: 2.3.13 %global prever %{nil} -Release: 3%{?dist} +Release: 4%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 @@ -55,6 +55,7 @@ BuildRequires: libsodium-devel BuildRequires: libicu-devel BuildRequires: libexttextcat-devel BuildRequires: libstemmer-devel +BuildRequires: multilib-rpm-config # gettext-devel is needed for running autoconf because of the # presence of AM_ICONV @@ -192,9 +193,11 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -#move doc dir back to build dir so doc macro in files section can use it +# move doc dir back to build dir so doc macro in files section can use it mv $RPM_BUILD_ROOT/%{_docdir}/%{name} %{_builddir}/%{name}-%{version}%{?prever}/docinstall +# fix multilib issues +%multilib_fix_c_header --file %{_includedir}/dovecot/config.h pushd dovecot-2*3-pigeonhole-%{pigeonholever} make install DESTDIR=$RPM_BUILD_ROOT @@ -449,6 +452,9 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Mon Jan 18 2021 Michal Hlavinka - 1:2.3.13-4 +- fix multilib issues + * Mon Jan 18 2021 Michal Hlavinka - 1:2.3.13-3 - bump release and rebuild