rpms/aces_container
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update patches

Browse source
This commit is contained in:
Nicolas Chauvet 2018-07-18 19:12:43 +02:00
commit bd5cea2431
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Switch-to-CMAKE-default-variables.patch
View file

@ -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 )

5
aces_container.spec
View file

@ -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 <kwizart@gmail.com> - 1.0.2-3
- Bump patch
* Wed Jul 18 2018 Nicolas Chauvet <kwizart@gmail.com> - 1.0.2-2
- Update patches