From 8f2936b7a40cbd901ba737f782d5809fde769dd2 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Jul 07 2020 14:27:34 +0000
Subject: Update to 2.1.17.0.


---

diff --git a/.gitignore b/.gitignore
index 089777d..699b9e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@ clog
 /OpenImageIO-2.1.14.0.tar.gz
 /OpenImageIO-2.1.15.0.tar.gz
 /OpenImageIO-2.1.16.0.tar.gz
+/OpenImageIO-2.1.17.0.tar.gz
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 9fbeae2..900403a 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,8 +1,9 @@
+%undefine __cmake_in_source_build
 %global sover 2.1
 
 Name:           OpenImageIO
-Version:        2.1.16.0
-Release:        2%{?dist}
+Version:        2.1.17.0
+Release:        1%{?dist}
 Summary:        Library for reading and writing images
 
 License:        BSD and MIT
@@ -13,8 +14,6 @@ Source0:        https://github.com/%{name}/oiio/archive/Release-%{version}/%{nam
 # Images for test suite
 #Source1:        https://github.com/OpenImageIO/oiio-images/archive/master/oiio-images.tar.gz
 
-Patch0:         oiio-test.patch
-
 # Needed until LibRaw is available on s390x and aarch64
 %if 0%{?rhel} >= 8
 ExclusiveArch:  x86_64 ppc64le
@@ -132,38 +131,30 @@ rm -rf src/include/tbb
 
 
 %build
-mkdir -p build/linux && pushd build/linux
 # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
 # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
+mkdir build/linux && pushd build/linux
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_SKIP_RPATH:BOOL=TRUE \
-       -DINCLUDE_INSTALL_DIR:PATH=/usr/include/%{name} \
        -DPYTHON_VERSION=%{python3_version} \
-       -DPYLIB_INSTALL_DIR:PATH=%{python3_sitearch} \
        -DBUILD_DOCS:BOOL=TRUE \
        -DINSTALL_DOCS:BOOL=FALSE \
        -DINSTALL_FONTS:BOOL=FALSE \
        -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
-       -DUSE_OPENSSL:BOOL=TRUE \
        -DSTOP_ON_WARNING:BOOL=FALSE \
-       -DUSE_CPP:STRING=14 \
        -DJPEG_INCLUDE_DIR=%{_includedir} \
        -DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \
        -DOpenGL_GL_PREFERENCE=GLVND \
-       -DVERBOSE=TRUE \
-       ../../
+       -DVERBOSE=TRUE
 
-%make_build
+%cmake_build
 
-#ifarch ppc ppc64
-#       -DNOTHREADS:BOOL=FALSE \
-#endif
 
 %install
-pushd build/linux
-%make_install
+%cmake_install
 
 # Move man pages to the right directory
+pushd %{_vpath_builddir}
 mkdir -p %{buildroot}%{_mandir}/man1
 cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
@@ -202,6 +193,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Thu Jul 02 2020 Richard Shaw <hobbes1069@gmail.com> - 2.1.17.0-1
+- Update to 2.1.17.0.
+
 * Thu Jun 04 2020 Nicolas Chauvet <kwizart@gmail.com> - 2.1.16.0-2
 - Rebuilt for OpenCV 4.3
 
diff --git a/sources b/sources
index 78a6ce8..ca3e44b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OpenImageIO-2.1.16.0.tar.gz) = 30de5e5f915ba319d6e63d0bac2c30c5368f8ebd1434e91cb5bcfad3d39efda5b1779a3fedbcdf0c94ec09f1d1370da0b785af06a1fb8f164dfa52adec0db6cb
+SHA512 (OpenImageIO-2.1.17.0.tar.gz) = e23ed9b27510d0791483f4ad7f32271f6cc4bcc1d94aef1b32c0c9f7319025740905414c957dcf873c8bcb8c3cd5584f2fb19a54842c3960e4c029950848891f