Related: RHEL-23879 - fix merge conflict

# Conflicts:
#   openexr.spec

openexr.spec

@@ -3,7 +3,7 @@
 
 Name:           openexr
 Version:        3.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Provides the specification and reference implementation of the EXR file format
 
 License:        BSD
@@ -106,7 +106,7 @@ Summary:        Development files for %{name}
 %check
 # Test 4 currently fails on aarch64 and sometimes times out on armv7hl
 # https://github.com/AcademySoftwareFoundation/openexr/issues/876
-%ifnarch armv7hl aarch64 s390x
+%ifnarch s390x armv7hl i686
 %ctest
 %endif
 
@@ -128,9 +128,12 @@ Summary:        Development files for %{name}
 
 
 %changelog
-* Wed Oct 23 2024 Josef Ridky <jridky@redhat.com> - 3.1.1-2
+* Wed Oct 23 2024 Josef Ridky <jridky@redhat.com> - 3.1.1-3
 - fix CVE-2023-5481 (RHEL-23879)
 
+* Mon Aug 23 2021 Josef Ridky <jridky@redhat.com> - 3.1.1-2
+- fix issue with tests on specified architectures
+
 * Thu Aug 05 2021 Josef Ridky <jridky@redhat.com> - 3.1.1-1
 - New upstream release 3.1.1