diff --git a/Switch-to-CMAKE-default-variables.patch b/Switch-to-CMAKE-default-variables.patch index a65306a..29f438a 100644 --- a/Switch-to-CMAKE-default-variables.patch +++ b/Switch-to-CMAKE-default-variables.patch @@ -112,9 +112,9 @@ index 838a1d9..a186346 100644 -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INCLUDE_DIR@ -AcesContainer_includedir=@INSTALL_INCLUDE_DIR@/aces -+libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ -+AcesContainer_includedir=@CMAKE_INSTALL_INCLUDEDIR@/aces ++libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ ++includedir=@CMAKE_INSTALL_PREFIX@@CMAKE_INSTALL_INCLUDEDIR@ ++AcesContainer_includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces Name: AcesContainer Description: A library containing an implementation of ACES Image Container File @@ -127,11 +127,11 @@ index f5e6392..c35e145 100644 get_filename_component( AcesContainer_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH ) -set(AcesContainer_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") -+set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@/aces") ++set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/aces") set(AcesContainer_LIBRARIES AcesContainer ) -set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" ) -+set(AcesContainer_LIBRARY_DIRS "@CMAKE_INSTALL_LIBDIR@" ) ++set(AcesContainer_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" ) set(AcesContainer_VERSION "@AcesContainer_VERSION@" ) set(AcesContainer_FOUND 1 ) diff --git a/aces_container.spec b/aces_container.spec index c4f937a..be02d3e 100644 --- a/aces_container.spec +++ b/aces_container.spec @@ -1,6 +1,6 @@ Name: aces_container Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ACES Container Reference License: AMPAS BSD @@ -73,6 +73,9 @@ cd build %changelog +* Wed Jul 18 2018 Nicolas Chauvet - 1.0.2-3 +- Bump patch + * Wed Jul 18 2018 Nicolas Chauvet - 1.0.2-2 - Update patches