From 8d7d964347bdb46a018eb6e8903473f851f8f5a2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 16 Apr 2019 19:30:26 -0600 Subject: [PATCH 1/3] Provide standard python 3 dist name (bugz#1700307) Conflicts: vtk.spec --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 87f048f..69596c8 100644 --- a/vtk.spec +++ b/vtk.spec @@ -20,7 +20,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.1.1 -Release: 3%{?dist} +Release: 4%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -233,6 +233,7 @@ tcl bindings for VTK. Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} +Provides: %{py3_dist vtk} = %{version} %description -n python%{python3_pkgversion}-vtk Python 3 bindings for VTK. @@ -1094,6 +1095,9 @@ cat xorg.log %changelog +* Tue Apr 16 2019 Orion Poplawski - 8.1.1-4 +- Provide standard python 3 dist name (bugz#1700307) + * Fri Feb 15 2019 Orion Poplawski - 8.1.1-3 - Rebuild for openmpi 3.1.3 From dadd82ba7022f98487ab7a0dcaf0574c2c46bd8b Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 18 Apr 2019 17:39:33 -0600 Subject: [PATCH 2/3] Provide starndard python 3.Y dist name (bugz#1700307) --- vtk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vtk.spec b/vtk.spec index 69596c8..efc856d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -20,7 +20,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.1.1 -Release: 4%{?dist} +Release: 5%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -234,6 +234,7 @@ Summary: Python 3 bindings for VTK Requires: vtk%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python%{python3_pkgversion}-vtk} Provides: %{py3_dist vtk} = %{version} +Provides: python%{python3_version}dist(vtk) = %{version} %description -n python%{python3_pkgversion}-vtk Python 3 bindings for VTK. @@ -1095,6 +1096,9 @@ cat xorg.log %changelog +* Thu Apr 18 2019 Orion Poplawski - 8.1.1-5 +- Provide starndard python 3.Y dist name (bugz#1700307) + * Tue Apr 16 2019 Orion Poplawski - 8.1.1-4 - Provide standard python 3 dist name (bugz#1700307) From 341ea15321021bb828374fdcbde21ab2e00847d1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 24 Oct 2019 20:05:59 -0600 Subject: [PATCH 3/3] Drop unneed SIP_INCLUDE_DIR definition that breaks some dependencies (bz#1765109) --- vtk.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vtk.spec b/vtk.spec index efc856d..a924b67 100644 --- a/vtk.spec +++ b/vtk.spec @@ -20,7 +20,7 @@ Summary: The Visualization Toolkit - A high level 3D visualization library Name: vtk Version: 8.1.1 -Release: 5%{?dist} +Release: 6%{?dist} # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -641,11 +641,6 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m %endif \ -DVTK_WRAP_PYTHON:BOOL=ON \\\ -DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\ -%if 0%{?fedora} >= 30 \ - -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python3_version} \\\ -%else \ - -DSIP_INCLUDE_DIR:PATH=/usr/include/python%{python2_version} \\\ -%endif \ -DVTK_WRAP_TCL:BOOL=ON \\\ -DVTK_Group_Imaging:BOOL=ON \\\ -DVTK_Group_Qt:BOOL=ON \\\ @@ -1096,6 +1091,9 @@ cat xorg.log %changelog +* Thu Oct 24 2019 Orion Poplawski - 8.1.1-6 +- Drop unneed SIP_INCLUDE_DIR definition that breaks some dependencies (bz#1765109) + * Thu Apr 18 2019 Orion Poplawski - 8.1.1-5 - Provide starndard python 3.Y dist name (bugz#1700307)