diff --git a/.gitignore b/.gitignore index 4da864a..d788fa8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,9 @@ /openvdb-6.1.0.tar.gz /openvdb-6.2.0.tar.gz /openvdb-7.0.0.tar.gz +<<<<<<< HEAD /openvdb-7.2.0.tar.gz +======= +/openvdb-8.0.0.tar.gz +/openvdb-8.0.1.tar.gz +>>>>>>> f33 diff --git a/openvdb.spec b/openvdb.spec index eb46358..23627d7 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -1,8 +1,11 @@ +# 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.2.0 +Version: 8.0.1 Release: 1%{?dist} Summary: C++ library for sparse volumetric data discretized on three-dimensional grids License: MPLv2.0 @@ -73,7 +76,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 @@ -90,15 +93,15 @@ This package contains the Python module. %prep %autosetup +%autosetup + # Hardcoded values sed -i \ -e 's|lib$|%{_lib}|g' \ %{name}/%{name}/CMakeLists.txt %{name}/%{name}/python/CMakeLists.txt -mkdir build %build -pushd build export CXXFLAGS="%{optflags} -Wl,--as-needed" # Ignore versions (python 3, etc.) %cmake \ @@ -114,23 +117,19 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed" -DOPENVDB_BUILD_UNITTESTS=OFF \ -DOPENVDB_ENABLE_RPATH=OFF \ -DOPENVDB_INSTALL_CMAKE_MODULES=OFF \ - -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} \ - .. -%make_build -popd + -DPYOPENVDB_INSTALL_DIRECTORY=%{python3_sitearch} +%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 . +# 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 @@ -139,9 +138,10 @@ find %{buildroot} -name '*.a' -delete %{_bindir}/vdb_print %files libs -%license %{name}/LICENSE %{name}/COPYRIGHT +%license LICENSE %doc README.md CHANGES -%{_libdir}/*.so.* +%{_libdir}/lib%{name}.so.%{version} +%{_libdir}/lib%{name}.so.8.0 %if 0%{?fedora} %files -n python3-%{name} @@ -151,12 +151,36 @@ find %{buildroot} -name '*.a' -delete %files devel %doc html %{_includedir}/* -%{_libdir}/*.so +%{_libdir}/lib%{name}.so %changelog -* Sun Jun 21 2020 Luya Tshimbalanga - 7.2.0-1 +* Fri Feb 05 2021 Luya Tshimbalanga - 8.0.1-1 +- Update to 8.0.1 + +* Mon Jan 25 2021 Kalev Lember - 8.0.0-5 +- Rebuilt for Boost 1.75 + +* Sun Jan 24 2021 Luya Tshimbalanga - 8.0.0-4 +- Rebuild to resolve .so dependency + +* Fri Jan 22 2021 Jonathan Wakely - 8.0.0-3 +- Rebuilt for Boost 1.75 + +* Fri Jan 01 2021 Richard Shaw - 8.0.0-2 +- Rebuild for OpenEXR 2.5.3. + +* Thu Dec 24 2020 Luya Tshimbalanga - 8.0.0-1 +- Update to 8.0.0 + +* Thu Dec 10 2020 Luya Tshimbalanga - 7.2.0-1 - Update to 7.2.0 +* Mon Aug 24 2020 Simone Caronni - 7.1.0-2 +- List shared object versions. + +* Fri Aug 21 2020 Simone Caronni - 7.0.0-10 +- Update for new packaging guidelines and fix build. + * Sun Jun 21 2020 Luya Tshimbalanga - 7.0.0-7 - Disable jemalloc build for RHEL and its derivative diff --git a/sources b/sources index e4c1f44..fe6891d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (openvdb-7.2.0.tar.gz) = f55ce585349272ddf534d2ccdf51ebbb1b50ac0a0431056c8f4d431cc6867e31cc0abdc3ea7856918904fc114406d896e89ee1b52be0eb6626cbf7ad9ac90160 +SHA512 (openvdb-8.0.1.tar.gz) = 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2