Resync with master.

OpenImageIO.spec

@@ -2,8 +2,8 @@
 #global beta beta1
 
 Name:           OpenImageIO
-Version:        1.6.14
-Release:        1%{?dist}
+Version:        1.6.12
+Release:        3%{?dist}
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -22,7 +22,7 @@ BuildRequires:  boost-devel
 BuildRequires:  glew-devel
 BuildRequires:  OpenEXR-devel ilmbase-devel
 BuildRequires:  python2-devel
-BuildRequires:  libpng-devel libtiff-devel libjpeg-turbo-devel giflib-devel
+BuildRequires:  libpng-devel libtiff-devel openjpeg-devel giflib-devel
 %if ! 0%{?rhel}
 BuildRequires:  libwebp-devel
 BuildRequires:  Field3D-devel
@@ -177,15 +177,8 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
-* Wed Jun  1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.14-1
-- Update to latest upstream release.
-
-* Sun May  1 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.13-1
-- Update to latest upstream release.
-- Change from openjpeg to libjpeg-turbo.
-
-* Tue Apr 26 2016 Orion Poplawski <orion@cora.nwra.com> - 1.6.12-3
-- Rebuild for OpenCV 3.1
+* Fri May 20 2016 Jonathan Wakely <jwakely@redhat.com> - 1.6.12-3
+- Rebuilt for linker errors in boost (#1331983)
 
 * Mon Apr 11 2016 Richard Shaw <hobbes1069@gmail.com> - 1.6.12-2
 - Rebuild for updated Field3D.