Hello community, here is the log from the commit of package openexr for openSUSE:Factory checked in at 2019-11-18 20:05:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openexr (Old) and /work/SRC/openSUSE:Factory/.openexr.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openexr" Mon Nov 18 20:05:33 2019 rev:33 rq:748755 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openexr/openexr.changes 2019-09-25 07:44:57.734760806 +0200 +++ /work/SRC/openSUSE:Factory/.openexr.new.26869/openexr.changes 2019-11-18 20:05:47.977731227 +0100 @@ -1,0 +2,41 @@ +Thu Nov 14 17:57:37 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add Fix-the-symlinks-creation.patch to fix the symlinks creation. + +------------------------------------------------------------------- +Mon Oct 7 09:56:42 UTC 2019 - pgaj...@suse.com + +- fix OpenEXR.pc + +------------------------------------------------------------------- +Fri Oct 4 14:20:41 UTC 2019 - pgaj...@suse.com + +- increase timeout for IlmImf test + +------------------------------------------------------------------- +Thu Sep 26 08:28:56 UTC 2019 - pgaj...@suse.com + +- version update to 2.4.0 + * Completely re-written CMake configuration files + * Improved support for building on Windows, via CMake + * Improved support for building on macOS, via CMake + * All code compiles without warnings on gcc, clang, msvc + * Cleanup of license and copyright notices + * floating-point exception handling is disabled by default + * New Slice::Make method to reliably compute base pointer for a slice. + * Miscellaneous bug fixes + * CVE-2018-18444 Issue #351 Out of Memory + * CVE-2018-18443 Issue #350 heap-buffer-overflow +- upstream does not provide gpg signature anymore + https://github.com/openexr/openexr/issues/565 +- modified sources + % baselibs.conf +- deleted patches + - openexr-CVE-2017-14988.patch (upstreamed) + - openexr-CVE-2017-9111,9113,9115.patch (upstreamed) + - openexr-CVE-2018-18444.patch (upstreamed) +- deleted sources + - openexr-2.3.0.tar.gz.sig (not needed) + - openexr.keyring (not needed) + +------------------------------------------------------------------- Old: ---- openexr-2.3.0.tar.gz openexr-2.3.0.tar.gz.sig openexr-CVE-2017-14988.patch openexr-CVE-2017-9111,9113,9115.patch openexr-CVE-2018-18444.patch openexr.keyring New: ---- Fix-the-symlinks-creation.patch v2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openexr.spec ++++++ --- /var/tmp/diff_new_pack.zfsrvn/_old 2019-11-18 20:06:02.333724021 +0100 +++ /var/tmp/diff_new_pack.zfsrvn/_new 2019-11-18 20:06:02.337724019 +0100 @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,41 +20,33 @@ %define asan_build 0 %define debug_build 0 %define sonum 24 -%global so_suffix -2_3-24 +%global so_suffix -2_4 Name: openexr -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Utilities for working with HDR images in OpenEXR format License: BSD-3-Clause Group: Productivity/Graphics/Other URL: http://www.openexr.com/ -Source0: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz -Source1: https://github.com/openexr/openexr/releases/download/v%{version}/openexr-%{version}.tar.gz.sig +Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf -Source3: openexr.keyring -# https://github.com/openexr/openexr/pull/401 -Patch0: openexr-CVE-2018-18444.patch -# https://github.com/openexr/openexr/pull/401 -# CVE-2017-9111 [bsc#1040109], CVE-2017-9113 [bsc#1040113], CVE-2017-9115 [bsc#1040115] -Patch1: openexr-CVE-2017-9111,9113,9115.patch -# CVE-2017-14988 [bsc#1061305] -Patch2: openexr-CVE-2017-14988.patch -BuildRequires: automake +Patch0: Fix-the-symlinks-creation.patch +BuildRequires: cmake BuildRequires: fltk-devel BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(IlmBase) >= 2.3.0 +BuildRequires: pkgconfig(IlmBase) >= %{version} BuildRequires: pkgconfig(zlib) Obsoletes: OpenEXR <= 1.6.1 Provides: OpenEXR = %{version} %if %{asan_build} || %{debug_build} BuildRequires: ilmbase-debugsource -BuildRequires: libHalf%{sonum}-debuginfo -BuildRequires: libIex%{so_suffix}-debuginfo -BuildRequires: libIexMath%{so_suffix}-debuginfo -BuildRequires: libIlmThread%{so_suffix}-debuginfo -BuildRequires: libImath%{so_suffix}-debuginfo +BuildRequires: libHalf%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIex%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIexMath%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libIlmThread%{so_suffix}-%{sonum}-debuginfo +BuildRequires: libImath%{so_suffix}-%{sonum}-debuginfo %endif %description @@ -70,46 +62,32 @@ * exr2aces, converter to ACES format * exrmultiview, combine two or more images into one multi-view -%package -n libIlmImf%{so_suffix} +%package -n libIlmImf%{so_suffix}-%{sonum} Summary: Library to Handle EXR Pictures in 16-Bit Floating-Point Format Group: System/Libraries -%description -n libIlmImf%{so_suffix} +%description -n libIlmImf%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. This package contains shared library libIlmImf -%post -n libIlmImf%{so_suffix} -p /sbin/ldconfig -%postun -n libIlmImf%{so_suffix} -p /sbin/ldconfig - -%files -n libIlmImf%{so_suffix} -%license LICENSE -%{_libdir}/libIlmImf-*.so.* - -%package -n libIlmImfUtil%{so_suffix} +%package -n libIlmImfUtil%{so_suffix}-%{sonum} Summary: Library to simplify development of OpenEXR utilities Group: System/Libraries -%description -n libIlmImfUtil%{so_suffix} +%description -n libIlmImfUtil%{so_suffix}-%{sonum} OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications. This package contains shared library libIlmImfUtil -%post -n libIlmImfUtil%{so_suffix} -p /sbin/ldconfig -%postun -n libIlmImfUtil%{so_suffix} -p /sbin/ldconfig - -%files -n libIlmImfUtil%{so_suffix} -%license LICENSE -%{_libdir}/libIlmImfUtil-*.so.* - %package devel Summary: Development files for the 16-bit FP EXR picture handling library Group: Development/Libraries/C and C++ -Requires: libIlmImf%{so_suffix} = %{version} -Requires: libIlmImfUtil%{so_suffix} = %{version} -Requires: libilmbase-devel >= 2.3.0 +Requires: ilmbase-devel >= 2.3.0 +Requires: libIlmImf%{so_suffix}-%{sonum} = %{version} +Requires: libIlmImfUtil%{so_suffix}-%{sonum} = %{version} Requires: pkgconfig Requires: pkgconfig(zlib) Obsoletes: OpenEXR-devel <= 1.6.1 @@ -125,7 +103,7 @@ %package doc Summary: Documentatino for the 16-bit FP EXR picture handling library -Group: Documentation/PDF +Group: Documentation/Other Obsoletes: OpenEXR-doc <= 1.6.1 Provides: OpenEXR-doc = %{version} @@ -138,20 +116,16 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build +pushd OpenEXR export PTHREAD_LIBS="-lpthread" %if %{debug_build} export CXXFLAGS="%{optflags} -O0" %endif -%configure \ - --docdir=%{_docdir}/%{name} \ - --disable-static \ - --enable-large-stack \ - --enable-imfexamples \ - --enable-imfhugetest +%cmake \ + -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" \ + -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} %if %{asan_build} vmemlimit=$(ulimit -v) if [ $vmemlimit != unlimited ]; then @@ -165,19 +139,32 @@ done %endif make %{?_smp_mflags} +popd %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +pushd OpenEXR +%cmake_install +popd %check %ifarch x86_64 -make %{?_smp_mflags} check +pushd OpenEXR +# tests takes LOONG, e. g. 20 min, in obs even more that +# exceed timeout limit 25 min +export LD_LIBRARY_PATH="$PWD/build/IlmImf:$PWD/build/IlmImfUtil:$LD_LIBRARY_PATH" +%ctest --timeout 3000 +popd %endif +%post -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIlmImf%{so_suffix}-%{sonum} -p /sbin/ldconfig + +%post -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig +%postun -n libIlmImfUtil%{so_suffix}-%{sonum} -p /sbin/ldconfig + %files -%license LICENSE -%doc AUTHORS ChangeLog NEWS README* +%license LICENSE.md +%doc CHANGES.md CODE_OF_CONDUCT.md CODEOWNERS CONTRIBUTING.md CONTRIBUTORS.md README.md SECURITY.md %{_bindir}/exrenvmap %{_bindir}/exrheader %{_bindir}/exrmakepreview @@ -185,19 +172,28 @@ %{_bindir}/exrstdattr %{_bindir}/exrmultiview %{_bindir}/exrmultipart +%{_bindir}/exr2aces %files devel %{_includedir}/OpenEXR %{_libdir}/libIlmImf.so +%{_libdir}/libIlmImf%{so_suffix}.so %{_libdir}/libIlmImfUtil.so +%{_libdir}/libIlmImfUtil%{so_suffix}.so %{_libdir}/pkgconfig/OpenEXR.pc -%{_datadir}/aclocal/openexr.m4 +%dir %{_libdir}/cmake/OpenEXR +%{_libdir}/cmake/OpenEXR/*.cmake %files doc %{_docdir}/%{name} -%exclude %{_docdir}/%{name}/AUTHORS -%exclude %{_docdir}/%{name}/ChangeLog -%exclude %{_docdir}/%{name}/NEWS -%exclude %{_docdir}/%{name}/README* +%exclude %{_docdir}/%{name}/{CHANGES.md,CODE_OF_CONDUCT.md,CODEOWNERS,CONTRIBUTING.md,CONTRIBUTORS.md,README.md,SECURITY.md} + +%files -n libIlmImf%{so_suffix}-%{sonum} +%license LICENSE.md +%{_libdir}/libIlmImf-*.so.* + +%files -n libIlmImfUtil%{so_suffix}-%{sonum} +%license LICENSE.md +%{_libdir}/libIlmImfUtil-*.so.* %changelog ++++++ Fix-the-symlinks-creation.patch ++++++ >From 4e54bde78f65c0fef8a9f794aaacea07813fba09 Mon Sep 17 00:00:00 2001 From: Antonio Rojas <aro...@archlinux.org> Date: Sat, 19 Oct 2019 09:58:10 +0200 Subject: [PATCH] Take DESTDIR into account when creating library symlinks --- IlmBase/config/LibraryDefine.cmake | 2 +- OpenEXR/config/LibraryDefine.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake index 0502825f..9fb92c1c 100644 --- a/IlmBase/config/LibraryDefine.cmake +++ b/IlmBase/config/LibraryDefine.cmake @@ -100,7 +100,7 @@ function(ILMBASE_DEFINE_LIBRARY libname) if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") set(verlibname) set(baselibname) diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake index 6946ca94..c5b6096a 100644 --- a/OpenEXR/config/LibraryDefine.cmake +++ b/OpenEXR/config/LibraryDefine.cmake @@ -94,7 +94,7 @@ function(OPENEXR_DEFINE_LIBRARY libname) if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR} ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") set(verlibname) set(baselibname) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.zfsrvn/_old 2019-11-18 20:06:02.377723999 +0100 +++ /var/tmp/diff_new_pack.zfsrvn/_new 2019-11-18 20:06:02.377723999 +0100 @@ -1,3 +1,3 @@ -libIlmImf-2_3-24 -libIlmImfUtil-2_3-24 +libIlmImf-2_4-24 +libIlmImfUtil-2_4-24 obsoletes "OpenEXR-<targettype> < <version>"
