[rpms/OpenImageIO] f44: Fix merge conflict.

[rpms/OpenImageIO] f44: Fix merge conflict.

[Richard Shaw]

A new commit has been pushed.

Repo   : rpms/OpenImageIO
Branch : f44
Commit : 947d9614b48309a85447bfd9fbb640fd54eb2bd1
Author : Richard Shaw <hobbes1069@gmail.com>
Date   : 2026-06-01T20:22:21-05:00
Stats  : +17/-5 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/OpenImageIO/c/947d9614b48309a85447bfd9fbb640fd54eb2bd1?branch=f44

Log:
Fix merge conflict.

---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 14c3684..0487bf6 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -41,6 +41,7 @@ BuildRequires:  fmt-devel
 BuildRequires:  freetype-devel
 BuildRequires:  giflib-devel
 BuildRequires:  glew-devel
+BuildRequires:  imath-devel
 # Only available on RPM Fusion
 BuildRequires:  libheif-devel
 BuildRequires:  libultrahdr-devel
@@ -203,10 +204,18 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 %{_includedir}/%{name}/
 
 
-%changelog
 * Tue Jun 02 2026 Richard Shaw <hobbes1069@gmail.com> - 1:3.1.14.0-1
 - Update to 3.1.14.0.
 
+* Sat May 30 2026 Richard Shaw <hobbes1069@gmail.com> - 1:3.1.12.0-5
+- Rebuild for OpenColorIO 2.5.2.
+
+* Mon May 25 2026 Richard Shaw <hobbes1069@gmail.com> - 1:3.1.12.0-4
+- Rebuild for OpenEXR 3.4.12.
+
+* Sat May 02 2026 Simone Caronni <negativo17@gmail.com> - 1:3.1.12.0-3
+- Rebuild for OpenJPH update.
+
 * Wed Apr 08 2026 Gwyn Ciesla <gwync@protonmail.com> - 1:3.1.12.0-2
 - Libraw rebuild
 

diff --git a/.gitignore b/.gitignore
index 9dda3ea..5fed1b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,4 @@ clog
 /OpenImageIO-3.1.8.0.tar.gz
 /OpenImageIO-3.1.9.0.tar.gz
 /OpenImageIO-3.1.12.0.tar.gz
+/OpenImageIO-3.1.14.0.tar.gz

diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 50abb66..0487bf6 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -2,8 +2,8 @@
 %global sover 3.1
 
 Name:           OpenImageIO
-Version:        3.1.12.0
-Release:        5%{?dist}
+Version:        3.1.14.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        Library for reading and writing images
 
@@ -204,7 +204,9 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
 %{_includedir}/%{name}/
 
 
-%changelog
+* Tue Jun 02 2026 Richard Shaw <hobbes1069@gmail.com> - 1:3.1.14.0-1
+- Update to 3.1.14.0.
+
 * Sat May 30 2026 Richard Shaw <hobbes1069@gmail.com> - 1:3.1.12.0-5
 - Rebuild for OpenColorIO 2.5.2.
 

diff --git a/sources b/sources
index e93cfb6..a1485de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (OpenImageIO-3.1.12.0.tar.gz) = d00877c1bca8c5ca19e4534787783a12c892215403282425d1685920b5f424b6fac217f049243c2106e5d981c7508115145e08ce5c5dd78633073c1ddd883f3e
+SHA512 (OpenImageIO-3.1.14.0.tar.gz) = dd5cb30edf8d6c2d61260cc2d91a7a29bbad11b18f83af93527f9308bff0e24b218584635fdad6a154a2c32f0c8c12a458a86261c76c36d9aa41106af8533a39