From d2cc020b20b6af7d4e92910ce44db81c828c8875 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Fri, 14 Aug 2020 01:13:31 -0700
Subject: [PATCH 01/16] Update to 7.1.0 Adhere to
 https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/

---
 .gitignore   |  1 +
 openvdb.spec | 24 +++++++++++++-----------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c27c232..f36b624 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /openvdb-6.1.0.tar.gz
 /openvdb-6.2.0.tar.gz
 /openvdb-7.0.0.tar.gz
+/openvdb-7.1.0.tar.gz
diff --git a/openvdb.spec b/openvdb.spec
index c50bd48..bbe0f3f 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -1,9 +1,12 @@
+# Force out of source build
+%undefine __cmake_in_source_build
+
 # Set to 1 to enable testsuite. Fails everywhere with GCC 8+.
 %global with_tests 0
 
 Name:           openvdb
-Version:        7.0.0
-Release:        9%{?dist}
+Version:        7.1.0
+Release:        1%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -95,10 +98,8 @@ sed -i \
     -e 's|lib$|%{_lib}|g' \
     %{name}/CMakeLists.txt %{name}/python/CMakeLists.txt
 
-mkdir build
 
 %build
-pushd build
 export CXXFLAGS="%{optflags} -Wl,--as-needed"
 # Ignore versions (python 3, etc.)
 %cmake \
@@ -115,19 +116,16 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed"
     -DOPENVDB_ENABLE_RPATH=OFF \
     -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \
     -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \
-    ..
-%make_build
-popd
+    .
+%cmake_build
 
 %if 0%{?with_tests}
 %check
-%make test
+%ctest test
 %endif
 
 %install
-pushd build
-%make_install
-popd
+%cmake_install
 
 # Let RPM pick up HTML documents in the files section
 mv %{buildroot}%{_prefix}/doc/html .
@@ -154,6 +152,10 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/*.so
 
 %changelog
+* Fri Aug 14 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 7.1.0-1
+- Update to 7.1.0
+- Adhere to https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-9
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 04b4a07..9cd4cde 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openvdb-7.0.0.tar.gz) = f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
+SHA512 (openvdb-7.1.0.tar.gz) = 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad

From 47920887e593cedb0f5002e504143b62042a792e Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Mon, 24 Aug 2020 16:23:04 +0200
Subject: [PATCH 02/16] List shared object versions

---
 openvdb.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/openvdb.spec b/openvdb.spec
index bbe0f3f..0f97516 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        7.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -139,7 +139,8 @@ find %{buildroot} -name '*.a' -delete
 %files libs
 %license %{name}/LICENSE %{name}/COPYRIGHT
 %doc README.md CHANGES
-%{_libdir}/*.so.*
+%{_libdir}/lib%{name}.so.%{version}
+%{_libdir}/lib%{name}.so.7
 
 %if 0%{?fedora}
 %files -n python3-%{name}
@@ -149,9 +150,12 @@ find %{buildroot} -name '*.a' -delete
 %files devel
 %doc html
 %{_includedir}/*
-%{_libdir}/*.so
+%{_libdir}/lib%{name}.so
 
 %changelog
+* Mon Aug 24 2020 Simone Caronni <negativo17@gmail.com> - 7.1.0-2
+- List shared object versions.
+
 * Fri Aug 14 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 7.1.0-1
 - Update to 7.1.0
 - Adhere to https://docs.fedoraproject.org/en-US/packaging-guidelines/CMake/

From 1041f13b3986b619fdc7440fa81de00e98e0cb3a Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Mon, 24 Aug 2020 16:42:04 +0200
Subject: [PATCH 03/16] Fix typo

---
 openvdb.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 0f97516..f7592f0 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -140,7 +140,7 @@ find %{buildroot} -name '*.a' -delete
 %license %{name}/LICENSE %{name}/COPYRIGHT
 %doc README.md CHANGES
 %{_libdir}/lib%{name}.so.%{version}
-%{_libdir}/lib%{name}.so.7
+%{_libdir}/lib%{name}.so.7.1
 
 %if 0%{?fedora}
 %files -n python3-%{name}

From 0f5b374f4c7ff8ef77caf22c4afbb729c6097bdb Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sat, 26 Dec 2020 14:17:59 -0800
Subject: [PATCH 04/16] Update to 8.0.0

---
 .gitignore   |  2 ++
 openvdb.spec | 22 ++++++++++++++--------
 sources      |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f36b624..52df895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /openvdb-6.2.0.tar.gz
 /openvdb-7.0.0.tar.gz
 /openvdb-7.1.0.tar.gz
+/openvdb-7.2.0.tar.gz
+/openvdb-8.0.0.tar.gz
diff --git a/openvdb.spec b/openvdb.spec
index f7592f0..493704a 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -5,8 +5,8 @@
 %global with_tests 0
 
 Name:           openvdb
-Version:        7.1.0
-Release:        2%{?dist}
+Version:        8.0.0
+Release:        1%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -64,6 +64,7 @@ volumetric applications typically encountered in feature film production.
 
 %package        devel
 Summary:        Development files for %{name}
+BuildRequires:  texlive-latex
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-doc < 6.1.0-1
 Provides:       %{name}-doc = %{version}-%{release}
@@ -76,7 +77,7 @@ applications that use %{name}.
 %package        -n python3-%{name}
 Summary:        OpenVDB Python module
 BuildRequires:  pkgconfig(python3)
-BuildRequires:  python3-numpy
+BuildRequires:  python3dist(numpy)
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-python3 < 6.2.0
 Obsoletes:      %{name}-python2 < 5.1.0-1
@@ -96,7 +97,7 @@ This package contains the Python module.
 # Hardcoded values
 sed -i \
     -e 's|lib$|%{_lib}|g' \
-    %{name}/CMakeLists.txt %{name}/python/CMakeLists.txt
+    %{name}/%{name}/CMakeLists.txt %{name}/%{name}/python/CMakeLists.txt
 
 
 %build
@@ -115,8 +116,7 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed"
     -DOPENVDB_BUILD_UNITTESTS=OFF \
     -DOPENVDB_ENABLE_RPATH=OFF \
     -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \
-    -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \
-    .
+    -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} 
 %cmake_build
 
 %if 0%{?with_tests}
@@ -137,10 +137,10 @@ find %{buildroot} -name '*.a' -delete
 %{_bindir}/vdb_print
 
 %files libs
-%license %{name}/LICENSE %{name}/COPYRIGHT
+%license LICENSE
 %doc README.md CHANGES
 %{_libdir}/lib%{name}.so.%{version}
-%{_libdir}/lib%{name}.so.7.1
+%{_libdir}/lib%{name}.so.8.0
 
 %if 0%{?fedora}
 %files -n python3-%{name}
@@ -153,6 +153,12 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Thu Dec 24 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.0-1
+- Update to 8.0.0
+
+* Thu Dec 10 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 7.2.0-1
+- Update to 7.2.0
+
 * Mon Aug 24 2020 Simone Caronni <negativo17@gmail.com> - 7.1.0-2
 - List shared object versions.
 
diff --git a/sources b/sources
index 9cd4cde..2ad0715 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openvdb-7.1.0.tar.gz) = 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
+SHA512 (openvdb-8.0.0.tar.gz) = b26dea41e5305bbe023362241b82dda7e168f8df9526270e6b214f8442ce7e2135889d79a1944928478ae1a2b24866381b3be4d2d1af7a5726e39724055a6e78

From f83c08c788afdaea4c6daebb48176a31628f8e54 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Fri, 1 Jan 2021 16:22:21 -0600
Subject: [PATCH 05/16] Rebuild for OpenEXR 2.5.3.

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 493704a..fe2fc26 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 8.0.0-2
+- Rebuild for OpenEXR 2.5.3.
+
 * Thu Dec 24 2020 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.0-1
 - Update to 8.0.0
 

From 81956474115c2d88ffcd78a41e2f628672f928df Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 22 Jan 2021 20:53:32 +0000
Subject: [PATCH 06/16] Rebuilt for Boost 1.75

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index fe2fc26..8530c7d 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 8.0.0-3
+- Rebuilt for Boost 1.75
+
 * Fri Jan 01 2021 Richard Shaw <hobbes1069@gmail.com> - 8.0.0-2
 - Rebuild for OpenEXR 2.5.3.
 

From c8db630db16d3088295639b016ee8bb3c49d0451 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sun, 24 Jan 2021 16:08:56 -0800
Subject: [PATCH 07/16] Rebuild to resolve .so dependency

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 8530c7d..406a51f 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Sun Jan 24 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.0-4
+- Rebuild to resolve .so dependency
+
 * Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 8.0.0-3
 - Rebuilt for Boost 1.75
 

From a2517384647d53958bcebb69c9c001ee4fb845fd Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 25 Jan 2021 11:03:47 +0100
Subject: [PATCH 08/16] Rebuilt for Boost 1.75

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 406a51f..4fe6651 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Mon Jan 25 2021 Kalev Lember <klember@redhat.com> - 8.0.0-5
+- Rebuilt for Boost 1.75
+
 * Sun Jan 24 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.0-4
 - Rebuild to resolve .so dependency
 

From 95cb2753363c3891a0aca0a3a8e5961afe1a681b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 22:38:36 +0000
Subject: [PATCH 09/16] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 4fe6651..6398379 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jan 25 2021 Kalev Lember <klember@redhat.com> - 8.0.0-5
 - Rebuilt for Boost 1.75
 

From b4346ffa7010c3890d6ec527167ac13715b24273 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sat, 6 Feb 2021 03:07:44 -0800
Subject: [PATCH 10/16] Update to 8.0.1

---
 .gitignore   |  1 +
 openvdb.spec | 11 +++++++----
 sources      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52df895..381c9d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /openvdb-7.1.0.tar.gz
 /openvdb-7.2.0.tar.gz
 /openvdb-8.0.0.tar.gz
+/openvdb-8.0.1.tar.gz
diff --git a/openvdb.spec b/openvdb.spec
index 6398379..6da38ab 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -5,8 +5,8 @@
 %global with_tests 0
 
 Name:           openvdb
-Version:        8.0.0
-Release:        6%{?dist}
+Version:        8.0.1
+Release:        1%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -127,8 +127,8 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed"
 %install
 %cmake_install
 
-# Let RPM pick up HTML documents in the files section
-mv %{buildroot}%{_prefix}/doc/html .
+# Let RPM pick up html documents in the files section
+mv %{buildroot}%{_docdir}/OpenVDB/html .
 rm -fr %{buildroot}%{_datadir}/doc
 
 find %{buildroot} -name '*.a' -delete
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Feb 05 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.1-1
+- Update to 8.0.1
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 2ad0715..fe6891d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openvdb-8.0.0.tar.gz) = b26dea41e5305bbe023362241b82dda7e168f8df9526270e6b214f8442ce7e2135889d79a1944928478ae1a2b24866381b3be4d2d1af7a5726e39724055a6e78
+SHA512 (openvdb-8.0.1.tar.gz) = 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2

From 747e27c12db31bd52be94ccfe53e0b94920cbedd Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Tue, 30 Mar 2021 19:38:37 +0100
Subject: [PATCH 11/16] Rebuilt for removed libstdc++ symbol (#1937698)

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 6da38ab..1d9d801 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 8.0.1-2
+- Rebuilt for removed libstdc++ symbol (#1937698)
+
 * Fri Feb 05 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.0.1-1
 - Update to 8.0.1
 

From 4878ab1d4ef91d4318f8b2a55e70dea2fc05e463 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 4 Jun 2021 20:14:04 +0200
Subject: [PATCH 12/16] Rebuilt for Python 3.10

---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index 1d9d801..295d6ee 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 8.0.1-3
+- Rebuilt for Python 3.10
+
 * Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 8.0.1-2
 - Rebuilt for removed libstdc++ symbol (#1937698)
 

From 05e65fa6a4ffc2c1ca049db3e84cda7127c1c4f6 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Mon, 14 Jun 2021 08:30:32 -0700
Subject: [PATCH 13/16] Update to 8.1.0 Resolves rhbz#1971100

---
 .gitignore   |  1 +
 openvdb.spec | 10 +++++++---
 sources      |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 381c9d1..e46bb01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /openvdb-7.2.0.tar.gz
 /openvdb-8.0.0.tar.gz
 /openvdb-8.0.1.tar.gz
+/openvdb-8.1.0.tar.gz
diff --git a/openvdb.spec b/openvdb.spec
index 295d6ee..abb3ce9 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -5,8 +5,8 @@
 %global with_tests 0
 
 Name:           openvdb
-Version:        8.0.1
-Release:        3%{?dist}
+Version:        8.1.0
+Release:        1%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -140,7 +140,7 @@ find %{buildroot} -name '*.a' -delete
 %license LICENSE
 %doc README.md CHANGES
 %{_libdir}/lib%{name}.so.%{version}
-%{_libdir}/lib%{name}.so.8.0
+%{_libdir}/lib%{name}.so.8.1
 
 %if 0%{?fedora}
 %files -n python3-%{name}
@@ -153,6 +153,10 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Mon Jun 14 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.1.0-1
+- Update to 8.1.0
+- Resolves rhbz#1971100
+
 * Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 8.0.1-3
 - Rebuilt for Python 3.10
 
diff --git a/sources b/sources
index fe6891d..1d21641 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openvdb-8.0.1.tar.gz) = 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
+SHA512 (openvdb-8.1.0.tar.gz) = 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5

From 229019515c83fd021ed560b30132f90e5789d887 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 17:23:05 +0000
Subject: [PATCH 14/16] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 openvdb.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openvdb.spec b/openvdb.spec
index abb3ce9..5ea11e7 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,7 +6,7 @@
 
 Name:           openvdb
 Version:        8.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
@@ -153,6 +153,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Jun 14 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.1.0-1
 - Update to 8.1.0
 - Resolves rhbz#1971100

From 5d0b81101f3ad9c6d47b50dd0f5ce00e1b455d80 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Fri, 23 Jul 2021 06:54:40 -0500
Subject: [PATCH 15/16] Move to OpenEXR 3.x.

---
 openvdb-openexr3.patch | 84 ++++++++++++++++++++++++++++++++++++++++++
 openvdb.spec           | 18 +++++++--
 2 files changed, 98 insertions(+), 4 deletions(-)
 create mode 100644 openvdb-openexr3.patch

diff --git a/openvdb-openexr3.patch b/openvdb-openexr3.patch
new file mode 100644
index 0000000..170e5c7
--- /dev/null
+++ b/openvdb-openexr3.patch
@@ -0,0 +1,84 @@
+Index: openvdb-8.1.0/openvdb/openvdb/cmd/CMakeLists.txt
+===================================================================
+--- openvdb-8.1.0.orig/openvdb/openvdb/cmd/CMakeLists.txt
++++ openvdb-8.1.0/openvdb/openvdb/cmd/CMakeLists.txt
+@@ -116,27 +116,36 @@ endif()
+ #### vdb_render
+ 
+ if(OPENVDB_BUILD_VDB_RENDER)
+-  find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
+-  find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
++  find_package(Imath CONFIG)
++  if(TARGET Imath::IMath)
++	find_package(OpenEXR CONFIG REQUIRED)
++  else()
++    find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
++    find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
+ 
+-  set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
+-  add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
++    set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
++    add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
+ 
+-  # Set deps. Note that the order here is important. If we're building against
+-  # Houdini 17.5 we must include OpenEXR and IlmBase deps first to ensure the
+-  # users chosen namespaced headers are correctly prioritized. Otherwise other
+-  # include paths from shared installs (including houdini) may pull in the wrong
+-  # headers
++    # Set deps. Note that the order here is important. If we're building against
++    # Houdini 17.5 we must include OpenEXR and IlmBase deps first to ensure the
++    # users chosen namespaced headers are correctly prioritized. Otherwise other
++    # include paths from shared installs (including houdini) may pull in the wrong
++    # headers
+ 
+   target_link_libraries(vdb_render
+-    IlmBase::Half
+-    OpenEXR::IlmImf
+-    IlmBase::IlmThread
+-    IlmBase::Iex
+-    IlmBase::Imath
++    # For OpenEXR/Imath 3.x:
++    $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
++    $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
++    $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
++    # For OpenEXR 2.4/2.5:
++    $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
++    $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
++    $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
++    $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
++    $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
+     ${OPENVDB_BINARIES_DEPENDENT_LIBS}
+   )
+-
++  endif()
+   if(WIN32)
+     # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed
+     get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE)
+Index: openvdb-8.1.0/openvdb/openvdb/Types.h
+===================================================================
+--- openvdb-8.1.0.orig/openvdb/openvdb/Types.h
++++ openvdb-8.1.0/openvdb/openvdb/Types.h
+@@ -9,7 +9,22 @@
+ #include "TypeList.h" // backwards compat
+ 
+ #ifdef OPENVDB_USE_IMATH_HALF
+-#include <OpenEXR/half.h>
++// The version can reliably be found in this header file from OpenEXR,
++// for both 2.x and 3.x:
++#include <OpenEXR/OpenEXRConfig.h>
++#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
++                                  (100*OPENEXR_VERSION_MINOR) + \
++                                  OPENEXR_VERSION_PATCH)
++
++// There's just no easy way to have an `#include` that works in both
++// cases, so we use the version to switch which set of include files we
++// use.
++#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
++#   include <Imath/half.h>
++#else
++    // OpenEXR 2.x, use the old locations
++#   include <OpenEXR/half.h>
++#endif
+ namespace openvdb {
+ OPENVDB_USE_VERSION_NAMESPACE
+ namespace OPENVDB_VERSION_NAME {
diff --git a/openvdb.spec b/openvdb.spec
index 5ea11e7..e9543fd 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,13 +6,15 @@
 
 Name:           openvdb
 Version:        8.1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
 
 Source0:        https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+Patch0:         openvdb-openexr3.patch
+
 BuildRequires:  boost-devel >= 1.61
 # boost-python3-devel merged in boost-devel for Fedora 33+
 # https://src.fedoraproject.org/rpms/boost/c/1f2e448e099a867f9da62b9da009d3dec5e1ad64?branch=master
@@ -35,10 +37,15 @@ BuildRequires:  glfw-devel >= 2.7
 %else
 BuildRequires:  pkgconfig(glfw3) >= 2.7
 %endif
-BuildRequires:  pkgconfig(IlmBase)
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(log4cplus) >= 1.0
-BuildRequires:  pkgconfig(OpenEXR) >= 2.2
+# IlmBase is built in as of OpenEXR 2.5, available starting in f34.
+%if 0%{?fedora} > 33
+BuildRequires:  cmake(OpenEXR)
+%else
+BuildRequires:  pkgconfig(OpenEXR) < 3
+BuildRequires:  pkgconfig(IlmBase)
+%endif
 BuildRequires:  pkgconfig(tbb) >= 3.0
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(zlib) > 1.2.7
@@ -92,7 +99,7 @@ This package contains the Python module.
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 # Hardcoded values
 sed -i \
@@ -153,6 +160,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Fri Jul 23 2021 Richard Shaw <hobbes1069@gmail.com> - 8.1.0-3
+- Move to OpenEXR 3.x.
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 764be4a4fd96741887ce10a6f482ca4071c8eda6 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Sun, 1 Aug 2021 00:18:41 -0700
Subject: [PATCH 16/16] Drop no longer needed OpenEXR and Imath dependencies

---
 openvdb-openexr3.patch | 84 ------------------------------------------
 openvdb.spec           | 14 ++-----
 2 files changed, 4 insertions(+), 94 deletions(-)
 delete mode 100644 openvdb-openexr3.patch

diff --git a/openvdb-openexr3.patch b/openvdb-openexr3.patch
deleted file mode 100644
index 170e5c7..0000000
--- a/openvdb-openexr3.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: openvdb-8.1.0/openvdb/openvdb/cmd/CMakeLists.txt
-===================================================================
---- openvdb-8.1.0.orig/openvdb/openvdb/cmd/CMakeLists.txt
-+++ openvdb-8.1.0/openvdb/openvdb/cmd/CMakeLists.txt
-@@ -116,27 +116,36 @@ endif()
- #### vdb_render
- 
- if(OPENVDB_BUILD_VDB_RENDER)
--  find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
--  find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
-+  find_package(Imath CONFIG)
-+  if(TARGET Imath::IMath)
-+	find_package(OpenEXR CONFIG REQUIRED)
-+  else()
-+    find_package(IlmBase ${MINIMUM_ILMBASE_VERSION} REQUIRED COMPONENTS Half Iex IlmThread Imath)
-+    find_package(OpenEXR ${MINIMUM_OPENEXR_VERSION} REQUIRED COMPONENTS IlmImf)
- 
--  set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
--  add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
-+    set(VDB_RENDER_SOURCE_FILES openvdb_render.cc)
-+    add_executable(vdb_render ${VDB_RENDER_SOURCE_FILES})
- 
--  # Set deps. Note that the order here is important. If we're building against
--  # Houdini 17.5 we must include OpenEXR and IlmBase deps first to ensure the
--  # users chosen namespaced headers are correctly prioritized. Otherwise other
--  # include paths from shared installs (including houdini) may pull in the wrong
--  # headers
-+    # Set deps. Note that the order here is important. If we're building against
-+    # Houdini 17.5 we must include OpenEXR and IlmBase deps first to ensure the
-+    # users chosen namespaced headers are correctly prioritized. Otherwise other
-+    # include paths from shared installs (including houdini) may pull in the wrong
-+    # headers
- 
-   target_link_libraries(vdb_render
--    IlmBase::Half
--    OpenEXR::IlmImf
--    IlmBase::IlmThread
--    IlmBase::Iex
--    IlmBase::Imath
-+    # For OpenEXR/Imath 3.x:
-+    $<$<TARGET_EXISTS:OpenEXR::OpenEXR>:OpenEXR::OpenEXR>
-+    $<$<TARGET_EXISTS:Imath::Imath>:Imath::Imath>
-+    $<$<TARGET_EXISTS:Imath::Half>:Imath::Half>
-+    # For OpenEXR 2.4/2.5:
-+    $<$<TARGET_EXISTS:OpenEXR::IlmImf>:OpenEXR::IlmImf>
-+    $<$<TARGET_EXISTS:IlmBase::Imath>:IlmBase::Imath>
-+    $<$<TARGET_EXISTS:IlmBase::Half>:IlmBase::Half>
-+    $<$<TARGET_EXISTS:IlmBase::IlmThread>:IlmBase::IlmThread>
-+    $<$<TARGET_EXISTS:IlmBase::Iex>:IlmBase::Iex>
-     ${OPENVDB_BINARIES_DEPENDENT_LIBS}
-   )
--
-+  endif()
-   if(WIN32)
-     # @note OPENVDB_OPENEXR_STATICLIB is old functionality and should be removed
-     get_target_property(ILMBASE_LIB_TYPE IlmBase::Half TYPE)
-Index: openvdb-8.1.0/openvdb/openvdb/Types.h
-===================================================================
---- openvdb-8.1.0.orig/openvdb/openvdb/Types.h
-+++ openvdb-8.1.0/openvdb/openvdb/Types.h
-@@ -9,7 +9,22 @@
- #include "TypeList.h" // backwards compat
- 
- #ifdef OPENVDB_USE_IMATH_HALF
--#include <OpenEXR/half.h>
-+// The version can reliably be found in this header file from OpenEXR,
-+// for both 2.x and 3.x:
-+#include <OpenEXR/OpenEXRConfig.h>
-+#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
-+                                  (100*OPENEXR_VERSION_MINOR) + \
-+                                  OPENEXR_VERSION_PATCH)
-+
-+// There's just no easy way to have an `#include` that works in both
-+// cases, so we use the version to switch which set of include files we
-+// use.
-+#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
-+#   include <Imath/half.h>
-+#else
-+    // OpenEXR 2.x, use the old locations
-+#   include <OpenEXR/half.h>
-+#endif
- namespace openvdb {
- OPENVDB_USE_VERSION_NAMESPACE
- namespace OPENVDB_VERSION_NAME {
diff --git a/openvdb.spec b/openvdb.spec
index e9543fd..3ca63c7 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -6,15 +6,13 @@
 
 Name:           openvdb
 Version:        8.1.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C++ library for sparse volumetric data discretized on three-dimensional grids
 License:        MPLv2.0
 URL:            http://www.openvdb.org/
 
 Source0:        https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Patch0:         openvdb-openexr3.patch
-
 BuildRequires:  boost-devel >= 1.61
 # boost-python3-devel merged in boost-devel for Fedora 33+
 # https://src.fedoraproject.org/rpms/boost/c/1f2e448e099a867f9da62b9da009d3dec5e1ad64?branch=master
@@ -39,13 +37,6 @@ BuildRequires:  pkgconfig(glfw3) >= 2.7
 %endif
 BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(log4cplus) >= 1.0
-# IlmBase is built in as of OpenEXR 2.5, available starting in f34.
-%if 0%{?fedora} > 33
-BuildRequires:  cmake(OpenEXR)
-%else
-BuildRequires:  pkgconfig(OpenEXR) < 3
-BuildRequires:  pkgconfig(IlmBase)
-%endif
 BuildRequires:  pkgconfig(tbb) >= 3.0
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(zlib) > 1.2.7
@@ -160,6 +151,9 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/lib%{name}.so
 
 %changelog
+* Sun Aug 1 2021 Luya Tshimbalanga <luya@fedoraproject.org> - 8.1.0-4
+- Drop no longer needed OpenEXR and Imath dependencies
+
 * Fri Jul 23 2021 Richard Shaw <hobbes1069@gmail.com> - 8.1.0-3
 - Move to OpenEXR 3.x.