The package rpms/ilmbase.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/ilmbase.git/commit/?id=d925ea9eea198....
Change: +%ifarch x86_64
Thanks.
Full change: ============
commit d925ea9eea1980eb0a8ac696f82b8bb3cbca97ca Author: Nicolas Chauvet kwizart@gmail.com Date: Thu Jul 11 19:10:28 2019 +0200
Fix multilibs conflict
diff --git a/ilmbase-config.h b/ilmbase-config.h new file mode 100644 index 0000000..eaa5b05 --- /dev/null +++ b/ilmbase-config.h @@ -0,0 +1,10 @@ +#include <bits/wordsize.h> + +#if __WORDSIZE == 32 +#include "IlmBaseConfig-32.h" +#elif __WORDSIZE == 64 +#include "IlmBaseConfig-64.h" +#else +#error "Unknown word size" +#endif + diff --git a/ilmbase.spec b/ilmbase.spec index bb2eb0b..53db6d6 100644 --- a/ilmbase.spec +++ b/ilmbase.spec @@ -3,11 +3,12 @@ Name: ilmbase Summary: Abstraction/convenience libraries Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist}
License: BSD URL: http://www.openexr.com/ Source0: https://github.com/%%7Bproject%7D/%%7Bproject%7D/releases/download/v%%7Bvers... +Source1: ilmbase-config.h
#BuildRequires: automake libtool BuildRequires: gcc-c++ @@ -69,6 +70,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
rm -fv %{buildroot}%{_libdir}/lib*.la
+# Fix multilibs header conflict +%ifarch x86_64 i686 +%ifarch x86_64 +mv %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h \ + %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig-64.h +%else +mv %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h \ + %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig-32.h +%endif +install -pm 0644 %{SOURCE1} %{buildroot}%{_includedir}/OpenEXR/IlmBaseConfig.h +%endif +
%check export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig @@ -101,6 +114,9 @@ test "$(pkg-config --modversion IlmBase)" = "%{version}"
%changelog +* Thu Jul 11 2019 Nicolas Chauvet kwizart@gmail.com - 2.3.0-2 +- Fix for multibs conflict - rhbz#1712198 + * Tue Apr 02 2019 Richard Shaw hobbes1069@gmail.com - 2.3.0-1 - Update to 2.3.0