From 3fc4e0ca3f09cc282280a750a96f2c5655074aa0 Mon Sep 17 00:00:00 2001 From: Luya Tshimbalanga Date: Dec 12 2019 07:36:48 +0000 Subject: Update to 7.0.0 Set python3 module installation path via cmake Drop epydoc dependency --- diff --git a/.gitignore b/.gitignore index e826853..c27c232 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /boost-1.67.patch /openvdb-6.1.0.tar.gz /openvdb-6.2.0.tar.gz +/openvdb-7.0.0.tar.gz diff --git a/openvdb.spec b/openvdb.spec index bef1259..9cbc688 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -2,7 +2,7 @@ %global with_tests 0 Name: openvdb -Version: 6.2.0 +Version: 7.0.0 Release: 1%{?dist} Summary: C++ library for sparse volumetric data discretized on three-dimensional grids License: MPLv2.0 @@ -16,7 +16,7 @@ BuildRequires: boost-python3-devel BuildRequires: cmake >= 2.8 BuildRequires: cppunit-devel >= 1.10 BuildRequires: doxygen >= 1.8.11 -BuildRequires: epydoc +#BuildRequires: epydoc BuildRequires: gcc-c++ BuildRequires: ghostscript >= 8.70 BuildRequires: glfw-devel >= 2.7 @@ -26,8 +26,6 @@ BuildRequires: libstdc++-devel BuildRequires: libXi-devel BuildRequires: log4cplus-devel >= 1.0 BuildRequires: OpenEXR-devel >= 2.2 -BuildRequires: python3-numpy -BuildRequires: python3-devel BuildRequires: tbb-devel >= 3.0 BuildRequires: zlib-devel > 1.2.7 @@ -62,19 +60,16 @@ applications that use %{name}. %package -n python3-%{name} Summary: OpenVDB Python module +BuildRequires: pkgconfig(python3) +BuildRequires: python3-numpy Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: %{name}-python3 < 6.2.0 -%{?python_provide:%python_provide python3-%{name}} Obsoletes: %{name}-python2 < 5.1.0-1 Provides: %{name}-python2 = %{version}-%{release} - +%{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} -OpenVDB is an Academy Award-winning open-source C++ library comprising a novel -hierarchical data structure and a suite of tools for the efficient storage and -manipulation of sparse volumetric data discretized on three-dimensional grids. -It is developed and maintained by Academy Software Foundation for use in -volumetric applications typically encountered in feature film production. +%{description} This package contains the Python module. @@ -84,7 +79,6 @@ This package contains the Python module. # Hardcoded values sed -i \ -e 's|lib$|%{_lib}|g' \ - -e 's|lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}|%{_lib}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages|g' \ %{name}/CMakeLists.txt %{name}/python/CMakeLists.txt mkdir build @@ -97,9 +91,11 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DOPENVDB_BUILD_DOCS=ON \ + -DOPENVDB_BUILD_PYTHON_MODULE=ON \ -DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \ + -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \ .. %make_build popd @@ -137,6 +133,11 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/*.so %changelog +* Wed Dec 11 2019 Luya Tshimbalanga - 7.0.0-1 +- Update to 7.0.0 +- Set python3 module installation path via cmake +- Drop epydoc dependency + * Thu Sep 19 2019 Luya Tshimbalanga - 6.2.0-1 - Update to 6.2.0 - Drop no longer needed upstream patch diff --git a/sources b/sources index 466ab8b..04b4a07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openvdb-6.2.0.tar.gz) = 9662b18113f76e5b49ef53d5c61caba9747992bfb2d01e24549c1838027212e640687b72af2e1a02feb4aca27b179a92c8a21f6fba73e20f549ff0fd63b8f0b1 +SHA512 (openvdb-7.0.0.tar.gz) = f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7