- adjusted python patch to fix also LIBDIR

Changed files:
    OpenImageIO-python.patch -> 1.2
    OpenImageIO.spec -> 1.6

diff --git a/OpenImageIO-python.patch b/OpenImageIO-python.patch
index 83d52e827a232f0ad0fa2743e22b597ba805eb3f..05361203a52bd5abf92f3cb3fa2715f0542b869c 100644 (file)
--- a/OpenImageIO-python.patch
+++ b/OpenImageIO-python.patch
@@ -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 ()
  

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 93391308827bdb90a59a64e41e49150295830e30..9ea14f351f6e9a689972ca36f074f86a008f0378 100644 (file)
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -262,7 +262,6 @@ install -d build
 cd build
 %cmake ../src \
        -DEMBEDPLUGINS=OFF \
-       -DLIBDIR=%{_libdir} \
        -DPYLIBDIR=%{py_sitedir} \
        -DPYTHON_VERSION=%{py_ver} \
        %{!?with_tbb:-DUSE_TBB=OFF} \