Add webp and LibRaw to build requirements and revert scm to current release

after failed downgrade attempt.

.gitignore

@@ -35,3 +35,4 @@ clog
 /oiio-Release-1.5.20.tar.gz
 /OpenImageIO-1.5.21.tar.gz
 /OpenImageIO-1.5.22.tar.gz
+/OpenImageIO-1.5.24.tar.gz

OpenImageIO.spec

@@ -1,9 +1,8 @@
 %global subname oiio
-#global beta beta1
 
 Name:           OpenImageIO
-Version:        1.5.22
-Release:        1%{?dist}
+Version:        1.5.24
+Release:        4%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -22,16 +21,16 @@ BuildRequires:  glew-devel
 BuildRequires:  OpenEXR-devel ilmbase-devel
 BuildRequires:  python2-devel
 BuildRequires:  libpng-devel libtiff-devel openjpeg-devel giflib-devel
-%if ! 0%{?rhel}
 BuildRequires:  libwebp-devel
+%if ! 0%{?rhel}
 BuildRequires:  Field3D-devel
 %endif
+BuildRequires:  LibRaw-devel
 BuildRequires:  hdf5-devel
 BuildRequires:  zlib-devel
 BuildRequires:  jasper-devel
 BuildRequires:  pugixml-devel
 BuildRequires:  opencv-devel
-BuildRequires:  LibRaw-devel
 
 # WARNING: OpenColorIO and OpenImageIO are cross dependent.
 # If an ABI incompatible update is done in one, the other also needs to be
@@ -93,7 +92,7 @@ Development files for package %{name}
 
 
 %prep
-%setup -q -n oiio-Release-%{version}
+%autosetup -n oiio-Release-%{version}
 
 # Remove bundled pugixml
 rm -f src/include/pugixml.hpp \
@@ -146,7 +145,6 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %files
-%{!?_licensedir:%global license %doc}
 %license LICENSE
 %doc CHANGES
 %{_libdir}/libOpenImageIO.so.*
@@ -173,6 +171,19 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Wed Jan 24 2018 Richard Shaw <hobbes1069@gmail.com> - 1.5.24-4
+- Add webp and LibRaw to build requirements and revert scm to current release
+  after failed downgrade attempt.
+
+* Mon Oct 03 2016 Richard Shaw <hobbes1069@gmail.com> - 1.5.24-3
+- Rebuild for pugixml with c++11 enabled.
+
+* Sun Jul  3 2016 Richard Shaw <hobbes1069@gmail.com> - 1.5.24-2
+- Rebuild for updated Field3D which broke due to soname bump, fixes BZ#1352267.
+
+* Thu Mar  3 2016 Richard Shaw <hobbes1069@gmail.com> - 1.5.24-1
+- Update to latest upstream release.
+
 * Thu Dec 17 2015 Richard Shaw <hobbes1069@gmail.com> - 1.5.22-1
 - Update to latest upstream release.
 - Add LibRaw to build requirements.
@@ -278,6 +289,7 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 - rebuild for boost 1.55.0
 
 * Mon May 19 2014 Richard Shaw <hobbes1069@gmail.com> - 1.4.7-1
+>>>>>>> master
 - Update to latest upstream release.
 
 * Tue Jan  7 2014 Richard Shaw <hobbes1069@gmail.com> - 1.3.10-1

sources

@@ -1 +1 @@
-fed8b18db1fcf69072a21e66124b70f8  OpenImageIO-1.5.22.tar.gz
+8c1f9a0ec5b55a18eeea76d33ca7a02c  OpenImageIO-1.5.24.tar.gz