From 4e8ceda42c065ca5943af6f8042bf518b3dc76a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=98=C3=ADdk=C3=BD?= Date: Mon, 16 Aug 2021 11:26:37 +0200 Subject: [PATCH] Resolves: #1978261 - import openexr to el9 --- .gitignore | 1 + openexr-gcc11.patch | 14 -------------- openexr.spec | 42 +++++++++++++++++++----------------------- sources | 2 +- 4 files changed, 21 insertions(+), 38 deletions(-) delete mode 100644 openexr-gcc11.patch diff --git a/.gitignore b/.gitignore index 72dcec0..8546fc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /openexr-2.5.3.tar.gz /openexr-2.5.4.tar.gz +/openexr-3.1.1.tar.gz diff --git a/openexr-gcc11.patch b/openexr-gcc11.patch deleted file mode 100644 index 4f6e54b..0000000 --- a/openexr-gcc11.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: openexr-2.5.3/OpenEXR/IlmImf/dwaLookups.cpp -=================================================================== ---- openexr-2.5.3.orig/OpenEXR/IlmImf/dwaLookups.cpp -+++ openexr-2.5.3/OpenEXR/IlmImf/dwaLookups.cpp -@@ -300,7 +300,8 @@ generateNoop() - unsigned short src = (unsigned short)i; - Xdr::write (tmp, src); - -- printf("0x%04x, ", dst); -+ // DST is a short, so the right length modifier is 'h' -+ printf("0x%04hx, ", dst); - } - printf("\n};\n"); - } diff --git a/openexr.spec b/openexr.spec index da2ecd1..4f0e933 100644 --- a/openexr.spec +++ b/openexr.spec @@ -1,19 +1,18 @@ %{?!python3_pkgversion:%global python3_pkgversion 3} -%global sover 25 +%global sover 30 Name: openexr -Version: 2.5.4 -Release: 4%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Provides the specification and reference implementation of the EXR file format License: BSD URL: https://www.openexr.com/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: openexr-gcc11.patch - BuildRequires: cmake gcc gcc-c++ BuildRequires: boost-devel +BuildRequires: imath-devel BuildRequires: python%{python3_pkgversion}-devel BuildRequires: zlib-devel @@ -72,14 +71,6 @@ useful mathematical objects, functions, and data types common in computer graphics applications, including the “half” 16-bit floating-point type. -%package -n python%{python3_pkgversion}-openexr -Summary: Python 3 binding for OpenEXR -%{?python_provide:%python_provide python3-openexr} - -%description -n python%{python3_pkgversion}-openexr -%{summary}. - - %package devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -125,26 +116,31 @@ Summary: Development files for %{name} %doc CHANGES.md CONTRIBUTING.md GOVERNANCE.md SECURITY.md CODE_OF_CONDUCT.md CONTRIBUTORS.md README.md %license LICENSE.md %{_libdir}/*.so.%{sover}* -%exclude %{_libdir}/libPy* - -%files -n python%{python3_pkgversion}-openexr -# Is it OK to dump the libraries in site-packages? -%{_libdir}/libPy*.so.%{sover}* -%{python3_sitearch}/*.so %files devel %{_docdir}/OpenEXR/ %{_includedir}/OpenEXR/ %{_libdir}/*.so -%{_libdir}/cmake/IlmBase/ -%{_libdir}/pkgconfig/IlmBase.pc -%{_libdir}/cmake/PyIlmBase/ -%{_libdir}/pkgconfig/PyIlmBase.pc %{_libdir}/cmake/OpenEXR/ %{_libdir}/pkgconfig/OpenEXR.pc %changelog +* Thu Aug 05 2021 Josef Ridky - 3.1.1-1 +- New upstream release 3.1.1 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jul 20 2021 Richard Shaw - 3.0.5-1 +- Update to 3.0.5. + +* Fri Jun 04 2021 Python Maint - 2.5.5-2 +- Rebuilt for Python 3.10 + +* Mon Mar 15 2021 Richard Shaw - 2.5.5-1 +- Update to 2.5.5. + * Tue Jan 26 2021 Fedora Release Engineering - 2.5.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 4233f75..0cf2bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openexr-2.5.4.tar.gz) = f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1 +SHA512 (openexr-3.1.1.tar.gz) = 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735