packages: OpenImageIO/OpenImageIO.spec, OpenImageIO/OpenImageIO-python.patc...

[qboosh]

Author: qboosh                       Date: Sun Nov 27 07:04:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- adjusted python patch to fix also LIBDIR

---- Files affected:
packages/OpenImageIO:
   OpenImageIO.spec (1.5 -> 1.6) , OpenImageIO-python.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/OpenImageIO/OpenImageIO.spec
diff -u packages/OpenImageIO/OpenImageIO.spec:1.5 packages/OpenImageIO/OpenImageIO.spec:1.6
--- packages/OpenImageIO/OpenImageIO.spec:1.5	Sat Nov 26 13:35:51 2011
+++ packages/OpenImageIO/OpenImageIO.spec	Sun Nov 27 08:04:36 2011
@@ -263,7 +263,6 @@
 cd build
 %cmake ../src \
 	-DEMBEDPLUGINS=OFF \
-	-DLIBDIR=%{_libdir} \
 	-DPYLIBDIR=%{py_sitedir} \
 	-DPYTHON_VERSION=%{py_ver} \
 	%{!?with_tbb:-DUSE_TBB=OFF} \
@@ -372,6 +371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2011/11/27 07:04:36  qboosh
+- adjusted python patch to fix also LIBDIR
+
 Revision 1.5  2011/11/26 12:35:51  qboosh
 - added system-dpx patch, use system dpx library in dpx plugin, moved the plugin to subpackage
 - added system-libcineon plugin (the plugin is not build currently though)

================================================================
Index: packages/OpenImageIO/OpenImageIO-python.patch
diff -u packages/OpenImageIO/OpenImageIO-python.patch:1.1 packages/OpenImageIO/OpenImageIO-python.patch:1.2
--- packages/OpenImageIO/OpenImageIO-python.patch:1.1	Fri Nov 18 16:59:01 2011
+++ packages/OpenImageIO/OpenImageIO-python.patch	Sun Nov 27 08:04:36 2011
@@ -1,15 +1,18 @@
 --- OpenImageIO-oiio-7d98ca6/src/CMakeLists.txt.orig	2011-11-05 08:35:00.000000000 +0100
 +++ OpenImageIO-oiio-7d98ca6/src/CMakeLists.txt	2011-11-17 21:14:23.986933229 +0100
-@@ -92,11 +92,11 @@
+@@ -91,12 +91,12 @@
+
  # Exec Install Locations
  set (BINDIR   "${CMAKE_INSTALL_PREFIX}/bin")
- set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib")
+-set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib")
 -set (PYLIBDIR "${CMAKE_INSTALL_PREFIX}/python")
++set (LIBDIR   "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
 +set (PYLIBDIR CACHE STRING "${CMAKE_INSTALL_PREFIX}/python")
  if (EXEC_INSTALL_PREFIX)
      set (BINDIR   "${EXEC_INSTALL_PREFIX}/bin")
-     set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib")
+-    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib")
 -    set (PYLIBDIR "${EXEC_INSTALL_PREFIX}/python")
++    set (LIBDIR   "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
 +    set (PYLIBDIR CACHE STRING "${EXEC_INSTALL_PREFIX}/python")
  endif ()
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenImageIO/OpenImageIO.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/OpenImageIO/OpenImageIO-python.patch?r1=1.1&r2=1.2&f=u