From 798ba80d725c5ba603ca89fdb60e73f8a24bbd13 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 23 May 2020 12:11:42 -0700 Subject: [PATCH 1/5] Drop removed boost-python3-devel from Fedora 33+ --- openvdb.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openvdb.spec b/openvdb.spec index 80e2d62..4b826d4 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -3,7 +3,7 @@ Name: openvdb Version: 7.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/ @@ -11,7 +11,10 @@ URL: http://www.openvdb.org/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: boost-devel >= 1.61 +# No longer needed on Fedora 33+ +%if 0%{?fedora} < 33 BuildRequires: boost-python3-devel +%endif BuildRequires: cmake >= 2.8 BuildRequires: doxygen >= 1.8.11 #BuildRequires: epydoc @@ -147,6 +150,9 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Sat May 23 2020 Luya Tshimbalanga - 7.0.0-4 +- Drop removed boost-python3-devel from Fedora 33+ + * Sat May 23 2020 Luya Tshimbalanga - 7.0.0-3 - Disable python3 binding for CentOS and Red Hat Enterprise - On RHEL and CentOS, glfw is exclusive for x86_64 From 8c2ca4dd2c645ab5c10e5f81ea00a7a80cbfb3bd Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 23 May 2020 12:14:01 -0700 Subject: [PATCH 2/5] Drop boost-python3-devel build requirement for Fedora 33+ --- openvdb.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openvdb.spec b/openvdb.spec index 4b826d4..ae3deb9 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -11,7 +11,8 @@ URL: http://www.openvdb.org/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: boost-devel >= 1.61 -# No longer needed on Fedora 33+ +# boost-python3-devel merged in boost-devel for Fedora 33+ +# https://src.fedoraproject.org/rpms/boost/c/1f2e448e099a867f9da62b9da009d3dec5e1ad64?branch=master %if 0%{?fedora} < 33 BuildRequires: boost-python3-devel %endif @@ -151,7 +152,7 @@ find %{buildroot} -name '*.a' -delete %changelog * Sat May 23 2020 Luya Tshimbalanga - 7.0.0-4 -- Drop removed boost-python3-devel from Fedora 33+ +- Drop boost-python3-devel build requirement for Fedora 33+ * Sat May 23 2020 Luya Tshimbalanga - 7.0.0-3 - Disable python3 binding for CentOS and Red Hat Enterprise From 771a79393f9bc1ed48e32b85be81229c62a2adc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 02:55:06 +0200 Subject: [PATCH 3/5] Rebuilt for Python 3.9 --- openvdb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openvdb.spec b/openvdb.spec index ae3deb9..8f18863 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -3,7 +3,7 @@ Name: openvdb Version: 7.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/ @@ -151,6 +151,9 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Tue May 26 2020 Miro Hrončok - 7.0.0-5 +- Rebuilt for Python 3.9 + * Sat May 23 2020 Luya Tshimbalanga - 7.0.0-4 - Drop boost-python3-devel build requirement for Fedora 33+ From 065e226a6f1321cbffb175eed3ad9afb190d0be4 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 28 May 2020 23:50:43 +0100 Subject: [PATCH 4/5] Rebuilt for Boost 1.73 --- openvdb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openvdb.spec b/openvdb.spec index 8f18863..f1cbd3c 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -3,7 +3,7 @@ Name: openvdb Version: 7.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/ @@ -151,6 +151,9 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Thu May 28 2020 Jonathan Wakely - 7.0.0-6 +- Rebuilt for Boost 1.73 + * Tue May 26 2020 Miro Hrončok - 7.0.0-5 - Rebuilt for Python 3.9 From f972080b0020079cc8fe81c5207624c171eafdb5 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sun, 21 Jun 2020 10:42:17 -0700 Subject: [PATCH 5/5] Disable jemalloc build for RHEL and its derivative --- openvdb.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openvdb.spec b/openvdb.spec index f1cbd3c..424820f 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -3,7 +3,7 @@ Name: openvdb Version: 7.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ library for sparse volumetric data discretized on three-dimensional grids License: MPLv2.0 URL: http://www.openvdb.org/ @@ -107,6 +107,9 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DOPENVDB_BUILD_DOCS=ON \ %if 0%{?fedora} -DOPENVDB_BUILD_PYTHON_MODULE=ON \ +%endif +%if 0%{?rhel} + -DCONCURRENT_MALLOC=None \ %endif -DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \ @@ -151,6 +154,9 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Sun Jun 21 2020 Luya Tshimbalanga - 7.0.0-7 +- Disable jemalloc build for RHEL and its derivative + * Thu May 28 2020 Jonathan Wakely - 7.0.0-6 - Rebuilt for Boost 1.73