Update to 7.0.0

Set python3 module installation path via cmake
Drop epydoc dependency
This commit is contained in:
Luya Tshimbalanga 2019-12-11 23:36:48 -08:00
parent 52beb296ba
commit 3fc4e0ca3f
No known key found for this signature in database
GPG Key ID: 5E528174D8A2609A
3 changed files with 15 additions and 13 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/boost-1.67.patch /boost-1.67.patch
/openvdb-6.1.0.tar.gz /openvdb-6.1.0.tar.gz
/openvdb-6.2.0.tar.gz /openvdb-6.2.0.tar.gz
/openvdb-7.0.0.tar.gz

View File

@ -2,7 +2,7 @@
%global with_tests 0 %global with_tests 0
Name: openvdb Name: openvdb
Version: 6.2.0 Version: 7.0.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: C++ library for sparse volumetric data discretized on three-dimensional grids Summary: C++ library for sparse volumetric data discretized on three-dimensional grids
License: MPLv2.0 License: MPLv2.0
@ -16,7 +16,7 @@ BuildRequires: boost-python3-devel
BuildRequires: cmake >= 2.8 BuildRequires: cmake >= 2.8
BuildRequires: cppunit-devel >= 1.10 BuildRequires: cppunit-devel >= 1.10
BuildRequires: doxygen >= 1.8.11 BuildRequires: doxygen >= 1.8.11
BuildRequires: epydoc #BuildRequires: epydoc
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: ghostscript >= 8.70 BuildRequires: ghostscript >= 8.70
BuildRequires: glfw-devel >= 2.7 BuildRequires: glfw-devel >= 2.7
@ -26,8 +26,6 @@ BuildRequires: libstdc++-devel
BuildRequires: libXi-devel BuildRequires: libXi-devel
BuildRequires: log4cplus-devel >= 1.0 BuildRequires: log4cplus-devel >= 1.0
BuildRequires: OpenEXR-devel >= 2.2 BuildRequires: OpenEXR-devel >= 2.2
BuildRequires: python3-numpy
BuildRequires: python3-devel
BuildRequires: tbb-devel >= 3.0 BuildRequires: tbb-devel >= 3.0
BuildRequires: zlib-devel > 1.2.7 BuildRequires: zlib-devel > 1.2.7
@ -62,19 +60,16 @@ applications that use %{name}.
%package -n python3-%{name} %package -n python3-%{name}
Summary: OpenVDB Python module Summary: OpenVDB Python module
BuildRequires: pkgconfig(python3)
BuildRequires: python3-numpy
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-python3 < 6.2.0 Obsoletes: %{name}-python3 < 6.2.0
%{?python_provide:%python_provide python3-%{name}}
Obsoletes: %{name}-python2 < 5.1.0-1 Obsoletes: %{name}-python2 < 5.1.0-1
Provides: %{name}-python2 = %{version}-%{release} Provides: %{name}-python2 = %{version}-%{release}
%{?python_provide:%python_provide python3-%{name}}
%description -n python3-%{name} %description -n python3-%{name}
OpenVDB is an Academy Award-winning open-source C++ library comprising a novel %{description}
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.
This package contains the Python module. This package contains the Python module.
@ -84,7 +79,6 @@ This package contains the Python module.
# Hardcoded values # Hardcoded values
sed -i \ sed -i \
-e 's|lib$|%{_lib}|g' \ -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 %{name}/CMakeLists.txt %{name}/python/CMakeLists.txt
mkdir build mkdir build
@ -97,9 +91,11 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed"
-DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \ -DCMAKE_NO_SYSTEM_FROM_IMPORTED=TRUE \
-DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \ -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON \
-DOPENVDB_BUILD_DOCS=ON \ -DOPENVDB_BUILD_DOCS=ON \
-DOPENVDB_BUILD_PYTHON_MODULE=ON \
-DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_BUILD_UNITTESTS=OFF \
-DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \
-DOPENVDB_INSTALL_CMAKE_MODULES=OFF \ -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \
-DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \
.. ..
%make_build %make_build
popd popd
@ -137,6 +133,11 @@ find %{buildroot} -name '*.a' -delete
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Wed Dec 11 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 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 <luya@fedoraproject.org> - 6.2.0-1 * Thu Sep 19 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 6.2.0-1
- Update to 6.2.0 - Update to 6.2.0
- Drop no longer needed upstream patch - Drop no longer needed upstream patch

View File

@ -1 +1 @@
SHA512 (openvdb-6.2.0.tar.gz) = 9662b18113f76e5b49ef53d5c61caba9747992bfb2d01e24549c1838027212e640687b72af2e1a02feb4aca27b179a92c8a21f6fba73e20f549ff0fd63b8f0b1 SHA512 (openvdb-7.0.0.tar.gz) = f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7