Accepting request 657683 from home:StefanBruens:branches:science_submi

- Add python3-vtk to vtk-devel Requires, same as for vtk-java/tcl
- Remove empty testing subpackage
- Fix path to VTK_DATA_ROOT default directory

OBS-URL: https://build.opensuse.org/request/show/657683
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=131

vtk-openmpi.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 12 19:32:47 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add python3-vtk to vtk-devel Requires, same as for vtk-java/tcl
+- Remove empty testing subpackage
+- Fix path to VTK_DATA_ROOT default directory
+
 -------------------------------------------------------------------
 Thu Nov 22 15:41:50 UTC 2018 - Todd R <toddrme2178@gmail.com>
 

vtk-openmpi.spec

@@ -135,13 +135,14 @@ This package provides the shared libraries for VTK.
 
 %package        devel
 Summary:        VTK header files for building C++ code
-# not strictly necessary, but required by VTKs cmake files
 Group:          Development/Libraries/C and C++
+# not strictly necessary, but required by VTKs cmake files
 Requires:       %{mpiver}
 Requires:       %{mpiver}-devel
 Requires:       %{name}-java = %{version}
 Requires:       %{name}-tcl = %{version}
 Requires:       %{shlib} = %{version}
+Requires:       python3-%{name} = %{version}
 Requires:       R-base-devel
 Requires:       cmake >= 3.4
 Requires:       gcc-c++
@@ -283,20 +284,6 @@ This package contains many examples showing how to use VTK.
 Examples are available in the C++, Tcl, Python and Java programming
 languages.
 
-%package        testing
-Summary:        Testing programs for VTK
-Group:          Productivity/Scientific/Other
-Requires:       %{shlib} = %{version}
-Requires:       vtkdata = %{version}
-
-%description    testing
-VTK is a software system for image processing, 3D graphics, volume
-rendering and visualization. VTK includes many advanced algorithms
-(e.g. surface reconstruction, implicit modelling, decimation) and
-rendering techniques (e.g. hardware-accelerated volume rendering,
-LOD control).
-
-This package provides a few testing programs for VTK.
 
 %prep
 %setup -q -n VTK-%{version}
@@ -304,9 +291,9 @@ This package provides a few testing programs for VTK.
 %patch3 -p1
 %patch4 -p1
 
-# Replace relative path ../../../VTKData with %%{_datadir}/%%{pkgname}data-%%{version}
+# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
 # otherwise it will break on symlinks.
-grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{pkgname},g'
+grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata,g'
 
 %build
 source %{mpiprefix}/bin/mpivars.sh

vtk.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Dec 12 19:32:47 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Add python3-vtk to vtk-devel Requires, same as for vtk-java/tcl
+- Remove empty testing subpackage
+- Fix path to VTK_DATA_ROOT default directory
+
 -------------------------------------------------------------------
 Thu Nov 22 15:41:50 UTC 2018 - Todd R <toddrme2178@gmail.com>
 

vtk.spec

@@ -126,11 +126,12 @@ This package provides the shared libraries for VTK.
 
 %package        devel
 Summary:        VTK header files for building C++ code
-# not strictly necessary, but required by VTKs cmake files
 Group:          Development/Libraries/C and C++
+# not strictly necessary, but required by VTKs cmake files
 Requires:       %{name}-java = %{version}
 Requires:       %{name}-tcl = %{version}
 Requires:       %{shlib} = %{version}
+Requires:       python3-%{name} = %{version}
 Requires:       R-base-devel
 Requires:       cmake >= 3.4
 Requires:       gcc-c++
@@ -275,21 +276,6 @@ This package contains many examples showing how to use VTK.
 Examples are available in the C++, Tcl, Python and Java programming
 languages.
 
-%package        testing
-Summary:        Testing programs for VTK
-Group:          Productivity/Scientific/Other
-Requires:       %{shlib} = %{version}
-Requires:       vtkdata = %{version}
-Conflicts:      vtk-compat_gl-testing
-
-%description    testing
-VTK is a software system for image processing, 3D graphics, volume
-rendering and visualization. VTK includes many advanced algorithms
-(e.g. surface reconstruction, implicit modelling, decimation) and
-rendering techniques (e.g. hardware-accelerated volume rendering,
-LOD control).
-
-This package provides a few testing programs for VTK.
 
 %prep
 %setup -q -n VTK-%{version}
@@ -297,9 +283,9 @@ This package provides a few testing programs for VTK.
 %patch3 -p1
 %patch4 -p1
 
-# Replace relative path ../../../VTKData with %%{_datadir}/%%{pkgname}data-%%{version}
+# Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata
 # otherwise it will break on symlinks.
-grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/%{pkgname},g'
+grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\./\.\./VTKData,%{_datadir}/vtkdata,g'
 
 %build
 export CFLAGS="%{optflags}"