commit d04611902f1a5e3e87b04e4935ca2c37dd350979
Author: Jakub Bogusz <[email protected]>
Date: Mon Apr 7 18:31:01 2014 +0200
- more libdir fixes; moved CTL files to /usr/share
ctl-libdir.patch | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
ctl.spec | 6 +++++-
2 files changed, 56 insertions(+), 1 deletion(-)
---
diff --git a/ctl.spec b/ctl.spec
index dba61a7..2cb1f0b 100644
--- a/ctl.spec
+++ b/ctl.spec
@@ -173,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libIlmCtl.so.*.*.*
%attr(755,root,root) %{_libdir}/libIlmCtlMath.so.*.*.*
%attr(755,root,root) %{_libdir}/libIlmCtlSimd.so.*.*.*
+%dir %{_datadir}/CTL
%files devel
%defattr(644,root,root,755)
@@ -199,7 +200,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/exr_ctl_exr
%attr(755,root,root) %{_bindir}/exrdpx
-%{_prefix}/lib/CTL
+%{_datadir}/CTL/change_saturation.ctl
+%{_datadir}/CTL/transform_DPX_EXR.ctl
+%{_datadir}/CTL/transform_EXR_DPX.ctl
+%{_datadir}/CTL/utilities.ctl
%files -n ctlrender
%defattr(644,root,root,755)
diff --git a/ctl-libdir.patch b/ctl-libdir.patch
index 9d2a6a2..7138583 100644
--- a/ctl-libdir.patch
+++ b/ctl-libdir.patch
@@ -43,3 +43,54 @@
endif()
install( FILES
+--- CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
++++ CTL-ctl-1.5/OpenEXR_CTL/CMakeLists.txt 2014-04-07 03:33:22.116802754
+0200
+@@ -13,7 +13,7 @@
+
+ if ( PKG_CONFIG_FOUND )
+ configure_file(../config/OpenEXR_CTL.pc.in
"${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY)
+-install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION
lib/pkgconfig COMPONENT dev )
++install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION
lib${LIB_SUFFIX}/pkgconfig COMPONENT dev )
+ endif()
+
+ # TODO CMake config
+--- CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp.orig 2013-10-22
19:39:04.000000000 +0200
++++ CTL-ctl-1.5/lib/IlmCtl/CtlInterpreter.cpp 2014-04-07 17:43:14.157354004
+0200
+@@ -128,8 +128,7 @@
+ #if defined (WIN32) || defined (WIN64)
+ path = "."; // default windows install location?
+ #else
+- path = ".:/usr/local/lib/CTL:/usr/local/" PACKAGE
+- "-" VERSION "/lib/CTL";
++ path = ".:/usr/share/CTL";
+ #endif
+
+ size_t pos = 0;
+--- CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
++++ CTL-ctl-1.5/OpenEXR_CTL/CtlModules/CMakeLists.txt 2014-04-07
17:47:19.351452055 +0200
+@@ -2,6 +2,6 @@
+ FILES
+ utilities.ctl
+ DESTINATION
+- ${INSTALL_LIB_DIR}/CTL
++ share/CTL
+ )
+
+--- CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
++++ CTL-ctl-1.5/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt 2014-04-07
17:47:40.999069082 +0200
+@@ -22,4 +22,4 @@
+
+ install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
+
+-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
++install( FILES change_saturation.ctl DESTINATION share/CTL )
+--- CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt.orig 2013-10-22
19:39:04.000000000 +0200
++++ CTL-ctl-1.5/OpenEXR_CTL/exrdpx/CMakeLists.txt 2014-04-07
17:48:14.727216452 +0200
+@@ -22,6 +22,6 @@
+
+ install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
+
+-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION
${INSTALL_LIB_DIR}/CTL )
++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION
share/CTL )
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ctl.git/commitdiff/d04611902f1a5e3e87b04e4935ca2c37dd350979
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
