From b848a91daeefbd510bcc878cd65d6b82f98c7b64 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 1 Feb 2021 13:33:44 +0000 Subject: [PATCH] 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/dovecot.git#886a96b230d1c52f5b076d6c818df91cbdc54231 --- dovecot.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dovecot.spec b/dovecot.spec index 02862e0..4f5e87b 100644 --- a/dovecot.spec +++ b/dovecot.spec @@ -5,7 +5,7 @@ Name: dovecot Epoch: 1 Version: 2.3.13 %global prever %{nil} -Release: 4%{?dist} +Release: 6%{?dist} #dovecot itself is MIT, a few sources are PD, pigeonhole is LGPLv2 License: MIT and LGPLv2 @@ -170,7 +170,7 @@ autoreconf -I . -fiv #required for aarch64 support sed -i 's|/etc/ssl|/etc/pki/dovecot|' doc/mkcert.sh doc/example-config/conf.d/10-ssl.conf -make %{?_smp_mflags} +%make_build #pigeonhole pushd dovecot-2*3-pigeonhole-%{pigeonholever} @@ -185,13 +185,13 @@ pushd dovecot-2*3-pigeonhole-%{pigeonholever} --with-dovecot=../ \ --without-unfinished-features -make %{?_smp_mflags} +%make_build popd %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # 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 @@ -200,7 +200,7 @@ mv $RPM_BUILD_ROOT/%{_docdir}/%{name} %{_builddir}/%{name}-%{version}%{?prever}/ %multilib_fix_c_header --file %{_includedir}/dovecot/config.h pushd dovecot-2*3-pigeonhole-%{pigeonholever} -make install DESTDIR=$RPM_BUILD_ROOT +%make_install mv $RPM_BUILD_ROOT/%{_docdir}/%{name} $RPM_BUILD_ROOT/%{_docdir}/%{name}-pigeonhole @@ -452,6 +452,12 @@ make check %{_libdir}/%{name}/dict/libdriver_pgsql.so %changelog +* Mon Feb 01 2021 Michal Hlavinka - 1:2.3.13-6 +- use make macros + +* Tue Jan 26 2021 Fedora Release Engineering - 1:2.3.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 18 2021 Michal Hlavinka - 1:2.3.13-4 - fix multilib issues