From 21f4f5b83a8c4f51cc538eda3fd4021225ab4b07 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Fri, 20 Sep 2019 02:02:43 -0700
Subject: [PATCH] Update to 6.2.0 Drop no longer needed upstream patch Rename
 subpackge module to python3-* Fix correct python module installation path

---
 openvdb.spec | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/openvdb.spec b/openvdb.spec
index 613ae36..bef1259 100644
--- a/openvdb.spec
+++ b/openvdb.spec
@@ -2,14 +2,13 @@
 %global with_tests 0
 
 Name:           openvdb
-Version:        6.1.0
-Release:        3%{?dist}
+Version:        6.2.0
+Release:        1%{?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
-Patch1:         https://patch-diff.githubusercontent.com/raw/AcademySoftwareFoundation/openvdb/pull/428.patch#/%{name}-python3.patch
 
 BuildRequires:  blosc-devel >= 1.5.0
 BuildRequires:  boost-devel >= 1.61
@@ -61,13 +60,16 @@ Provides:       %{name}-doc = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for developing
 applications that use %{name}.
 
-%package        python3
+%package        -n python3-%{name}
 Summary:        OpenVDB Python module
 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}
 
-%description    python3
+
+%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.
@@ -77,12 +79,12 @@ volumetric applications typically encountered in feature film production.
 This package contains the Python module.
 
 %prep
-%autosetup -p1
+%autosetup
 
 # Hardcoded values
 sed -i \
     -e 's|lib$|%{_lib}|g' \
-    -e 's|lib/python|%{_lib}/python|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
@@ -113,8 +115,8 @@ pushd build
 popd
 
 # Let RPM pick up HTML documents in the files section
-mv %{buildroot}/%{_prefix}/docs/html .
-rm -fr %{buildroot}/%{_datadir}/doc
+mv %{buildroot}%{_prefix}/doc/html .
+rm -fr %{buildroot}%{_datadir}/doc
 
 find %{buildroot} -name '*.a' -delete
 
@@ -123,10 +125,10 @@ find %{buildroot} -name '*.a' -delete
 
 %files libs
 %license %{name}/LICENSE %{name}/COPYRIGHT
-%doc README.md %{name}/CHANGES
+%doc README.md CHANGES
 %{_libdir}/*.so.*
 
-%files python3
+%files -n python3-%{name}
 %{python3_sitearch}/py%{name}.so
 
 %files devel
@@ -135,6 +137,12 @@ find %{buildroot} -name '*.a' -delete
 %{_libdir}/*.so
 
 %changelog
+* Thu Sep 19 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 6.2.0-1
+- Update to 6.2.0
+- Drop no longer needed upstream patch
+- Rename subpackge module to python3-*
+- Fix correct python module installation path
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 6.1.0-3
 - Rebuilt for Python 3.8