From 8ecdf50e7da11986a2d8bb8277a3f43891bec087 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Jul 18 2018 10:13:06 +0000 Subject: Update patches --- diff --git a/Switch-to-CMAKE-default-variables.patch b/Switch-to-CMAKE-default-variables.patch index 242d6b2..a65306a 100644 --- a/Switch-to-CMAKE-default-variables.patch +++ b/Switch-to-CMAKE-default-variables.patch @@ -93,12 +93,12 @@ index 314d42c..f5fa059 100644 "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/AcesContainerConfig.cmake" "${PROJECT_BINARY_DIR}/AcesContainerConfigVersion.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake" COMPONENT dev) ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev) # Install the export set for use with the install-tree install(EXPORT AcesContainerTargets DESTINATION - "${INSTALL_CMAKE_DIR}" COMPONENT dev) -+ "${CMAKE_INSTALL_LIBDIR}/cmake" COMPONENT dev) ++ "${CMAKE_INSTALL_LIBDIR}/cmake/AcesContainer" COMPONENT dev) diff --git a/config/AcesContainer.pc.in b/config/AcesContainer.pc.in @@ -127,7 +127,7 @@ 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@") ++set(AcesContainer_INCLUDE_DIRS "@CMAKE_INSTALL_INCLUDEDIR@/aces") set(AcesContainer_LIBRARIES AcesContainer ) -set(AcesContainer_LIBRARY_DIRS "@CONF_LIB_DIRS@" ) diff --git a/aces_container.spec b/aces_container.spec index f5ede74..c4f937a 100644 --- a/aces_container.spec +++ b/aces_container.spec @@ -1,6 +1,6 @@ Name: aces_container Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ACES Container Reference License: AMPAS BSD @@ -66,12 +66,16 @@ cd build %files devel %dir %{_includedir}/aces/ %{_includedir}/aces/*.h -%{_libdir}/cmake/*.cmake +%dir %{_libdir}/cmake/AcesContainer +%{_libdir}/cmake/AcesContainer/*.cmake %{_libdir}/libAcesContainer.so %{_libdir}/pkgconfig/AcesContainer.pc %changelog +* Wed Jul 18 2018 Nicolas Chauvet - 1.0.2-2 +- Update patches + * Tue Jul 17 2018 Nicolas Chauvet - 1.0.2-1 - Update to 1.0.2