diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 105d688..4391135 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -20,6 +20,7 @@ Patch0: oiio-arm.patch Patch1: oiio-ppc.patch Patch2: oiio-s390.patch Patch3: oiio-hdf5.patch +Patch4: oiio-cmake.patch %if 0%{?rhel} BuildRequires: cmake28 @@ -95,6 +96,7 @@ Development files for package %{name} %patch1 -p1 -b .ppc #patch2 -p1 -b .s390 %patch3 -p1 -b .hdf5 +%patch4 -p1 -b .cmake # Install FindTBB.cmake install %{SOURCE101} src/cmake/modules/ diff --git a/oiio-cmake.patch b/oiio-cmake.patch new file mode 100644 index 0000000..4e167d1 --- /dev/null +++ b/oiio-cmake.patch @@ -0,0 +1,15 @@ +diff -Naur oiio-Release-1.2.1.orig/src/CMakeLists.txt oiio-Release-1.2.1/src/CMakeLists.txt +--- oiio-Release-1.2.1.orig/src/CMakeLists.txt 2013-08-06 00:10:31.000000000 -0500 ++++ oiio-Release-1.2.1/src/CMakeLists.txt 2013-10-01 14:56:40.148707021 -0500 +@@ -396,9 +396,9 @@ + set (CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/doc/Description.txt") + set (CPACK_PACKAGE_FILE_NAME OpenImageIO-${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR}.${OIIO_VERSION_PATCH}-${platform}) + #SET (CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_SOURCE_DIR}/..) +-exec_program ("cmake -E copy ${PROJECT_SOURCE_DIR}/../LICENSE ${CMAKE_BINARY_DIR}/License.txt") ++exec_program ("${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/../LICENSE ${CMAKE_BINARY_DIR}/License.txt") + set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_BINARY_DIR}/License.txt") +-exec_program ("cmake -E copy ${PROJECT_SOURCE_DIR}/../README.rst ${CMAKE_BINARY_DIR}/Readme.rst") ++exec_program ("${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/../README.rst ${CMAKE_BINARY_DIR}/Readme.rst") + set (CPACK_RESOURCE_FILE_README "${CMAKE_BINARY_DIR}/Readme.rst") + set (CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/doc/Welcome.txt") + #SET (CPACK_STRIP_FILES Do we need this?)