From b43ae634f0207aff6a6f9d390226c6a1ebe45877 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Sat, 23 May 2020 09:51:51 -0700 Subject: [PATCH] Disable python3 binding for CentOS and Red Hat Enterprise Use pkgconfig for more build requirements --- openvdb.spec | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/openvdb.spec b/openvdb.spec index 9cbc688..5e9d987 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -3,31 +3,31 @@ Name: openvdb Version: 7.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/ Source0: https://github.com/AcademySoftwareFoundation/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: blosc-devel >= 1.5.0 BuildRequires: boost-devel >= 1.61 BuildRequires: boost-python3-devel BuildRequires: cmake >= 2.8 -BuildRequires: cppunit-devel >= 1.10 BuildRequires: doxygen >= 1.8.11 #BuildRequires: epydoc BuildRequires: gcc-c++ BuildRequires: ghostscript >= 8.70 -BuildRequires: glfw-devel >= 2.7 -BuildRequires: ilmbase-devel -BuildRequires: jemalloc-devel BuildRequires: libstdc++-devel -BuildRequires: libXi-devel -BuildRequires: log4cplus-devel >= 1.0 -BuildRequires: OpenEXR-devel >= 2.2 -BuildRequires: tbb-devel >= 3.0 -BuildRequires: zlib-devel > 1.2.7 +BuildRequires: pkgconfig(blosc) >= 1.5.0 +BuildRequires: pkgconfig(cppunit) >= 1.10 +BuildRequires: pkgconfig(glfw3) >= 2.7 +BuildRequires: pkgconfig(IlmBase) +BuildRequires: pkgconfig(jemalloc) +BuildRequires: pkgconfig(log4cplus) >= 1.0 +BuildRequires: pkgconfig(OpenEXR) >= 2.2 +BuildRequires: pkgconfig(tbb) >= 3.0 +BuildRequires: pkgconfig(xi) +BuildRequires: pkgconfig(zlib) > 1.2.7 %description OpenVDB is an Academy Award-winning open-source C++ library comprising a novel @@ -58,6 +58,7 @@ Provides: %{name}-doc = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%if 0%{?fedora} %package -n python3-%{name} Summary: OpenVDB Python module BuildRequires: pkgconfig(python3) @@ -72,6 +73,8 @@ Provides: %{name}-python2 = %{version}-%{release} %{description} This package contains the Python module. +%endif + %prep %autosetup @@ -91,7 +94,9 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DOPENVDB_BUILD_DOCS=ON \ +%if 0%{?fedora} -DOPENVDB_BUILD_PYTHON_MODULE=ON \ +%endif -DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \ @@ -124,8 +129,10 @@ find %{buildroot} -name '*.a' -delete %doc README.md CHANGES %{_libdir}/*.so.* +%if 0%{?fedora} %files -n python3-%{name} %{python3_sitearch}/py%{name}.so +%endif %files devel %doc html @@ -133,6 +140,10 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Sat May 23 2020 Luya Tshimbalanga - 7.0.0-2 +- Disable python3 binding for CentOS and Red Hat Enterprise +- Use pkgconfig for more build requirements + * Wed Dec 11 2019 Luya Tshimbalanga - 7.0.0-1 - Update to 7.0.0 - Set python3 module installation path via cmake