Hello community, here is the log from the commit of package openexr for openSUSE:Factory checked in at 2020-02-14 16:22:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openexr (Old) and /work/SRC/openSUSE:Factory/.openexr.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openexr" Fri Feb 14 16:22:59 2020 rev:35 rq:773383 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openexr/openexr.changes 2019-12-02 11:31:06.810566448 +0100 +++ /work/SRC/openSUSE:Factory/.openexr.new.26092/openexr.changes 2020-02-14 16:23:06.127116645 +0100 @@ -1,0 +2,6 @@ +Mon Feb 10 17:39:14 UTC 2020 - Stefan Brüns <[email protected]> + +- Fix relative paths in generated pkgconfig files: + 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch + +------------------------------------------------------------------- New: ---- 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openexr.spec ++++++ --- /var/tmp/diff_new_pack.2vd80n/_old 2020-02-14 16:23:06.867117047 +0100 +++ /var/tmp/diff_new_pack.2vd80n/_new 2020-02-14 16:23:06.867117047 +0100 @@ -1,7 +1,7 @@ # # spec file for package openexr # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,6 +31,7 @@ Source0: https://github.com/openexr/openexr/archive/v%{version}.tar.gz Source2: baselibs.conf Patch0: Fix-the-symlinks-creation.patch +Patch1: 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch BuildRequires: cmake BuildRequires: fltk-devel BuildRequires: freeglut-devel @@ -116,6 +117,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build pushd OpenEXR @@ -124,8 +126,7 @@ export CXXFLAGS="%{optflags} -O0" %endif %cmake \ - -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" \ - -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} + -DCMAKE_INSTALL_DOCDIR="%{_docdir}/%{name}" %if %{asan_build} vmemlimit=$(ulimit -v) if [ $vmemlimit != unlimited ]; then ++++++ 0001-Use-absolute-CMAKE_INSTALL_FULL_LIBDIR-for-libdir-in.patch ++++++ >From d874a3ce5ad741ea61f42953c779d50ae93b66d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Mon, 10 Feb 2020 18:37:32 +0100 Subject: [PATCH] Use absolute CMAKE_INSTALL_FULL_LIBDIR for libdir in pkgconfig files According to cmake GNUInstallDirs documentation, CMAKE_INSTALL_LIBDIR may be either absolute or relative to CMAKE_INSTALL_PREFIX. Use CMAKE_INSTALL_FULL_LIBDIR, which is always the full absolute path. Remove unused exec_prefix variable. Fixes https://github.com/AcademySoftwareFoundation/openexr/issues/595 --- IlmBase/IlmBase.pc.in | 1 - IlmBase/config/CMakeLists.txt | 5 ++--- OpenEXR/OpenEXR.pc.in | 1 - OpenEXR/config/CMakeLists.txt | 5 ++--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/IlmBase/IlmBase.pc.in b/IlmBase/IlmBase.pc.in index 45fc4de..1edd055 100644 --- a/IlmBase/IlmBase.pc.in +++ b/IlmBase/IlmBase.pc.in @@ -4,7 +4,6 @@ ## prefix=@prefix@ -exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ libsuffix=@LIB_SUFFIX_DASH@ diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt index 508176a..e533987 100644 --- a/IlmBase/config/CMakeLists.txt +++ b/IlmBase/config/CMakeLists.txt @@ -71,9 +71,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) # use a helper function to avoid variable pollution, but pretty simple function(ilmbase_pkg_config_help pcinfile) set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) - set(libdir ${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) if(TARGET Threads::Threads) # hrm, can't use properties as they end up as generator expressions diff --git a/OpenEXR/OpenEXR.pc.in b/OpenEXR/OpenEXR.pc.in index cf72f88..4df6035 100644 --- a/OpenEXR/OpenEXR.pc.in +++ b/OpenEXR/OpenEXR.pc.in @@ -4,7 +4,6 @@ ## prefix=@prefix@ -exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ OpenEXR_includedir=@includedir@/OpenEXR diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt index 1ef829a..e068d2f 100644 --- a/OpenEXR/config/CMakeLists.txt +++ b/OpenEXR/config/CMakeLists.txt @@ -72,9 +72,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) # use a helper function to avoid variable pollution, but pretty simple function(openexr_pkg_config_help pcinfile) set(prefix ${CMAKE_INSTALL_PREFIX}) - set(exec_prefix ${CMAKE_INSTALL_BINDIR}) - set(libdir ${CMAKE_INSTALL_LIBDIR}) - set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) + set(libdir ${CMAKE_INSTALL_FULL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR}) set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) if(TARGET Threads::Threads) # hrm, can't use properties as they end up as generator expressions -- 2.25.0
