From cf384ac9ebe48a87b9661ecd6861fcc76da83f79de97957d06e6b81d065a8669 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sat, 16 Sep 2017 16:31:56 +0000 Subject: [PATCH] Accepting request 526303 from home:StefanBruens:branches:science - Remove the various subpackage Requires from the devel package again. The qt subpackage contains a Qt Designer plugin and no dependency at all. Package the vtkWrap{Tcl,Java,Python} wrapper generators in the devel package, as these are useless without the vtk headers files. -> see https://public.kitware.com/pipermail/vtk-developers/2017-September/035435.html - Fix description/summary of vtk-qt subpackage OBS-URL: https://build.opensuse.org/request/show/526303 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=98 --- vtk-compat_gl.changes | 9 +++++++++ vtk-compat_gl.spec | 15 ++++++--------- vtk.changes | 10 ++++++++++ vtk.spec | 19 ++++++++----------- 4 files changed, 33 insertions(+), 20 deletions(-) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index 1bfe2d9..7c3389d 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 14 19:50:52 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Remove the various subpackage Requires from the devel package + again. The qt subpackage contains a Qt Designer plugin and no + dependency at all. Package the vtkWrap{Tcl,Java,Python} wrapper + generators in the devel package, as these are useless without + the vtk headers files. + ------------------------------------------------------------------- Tue Sep 12 12:33:38 UTC 2017 - kkhere.geo@gmail.com diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 5edaec8..044699c 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -144,9 +144,6 @@ This package provides the shared libraries for VTK. %package devel Summary: VTK header files for building C++ code Group: Development/Libraries/C and C++ -Requires: %{name}-java = %{version} -Requires: %{name}-qt = %{version} -Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} Requires: Mesa-libGL-devel Requires: R-base-devel @@ -441,6 +438,12 @@ chrpath -d %{buildroot}%{_bindir}/* %{_bindir}/%{pkgname}EncodeString %{_bindir}/%{pkgname}HashSource %{_bindir}/%{pkgname}WrapHierarchy +%{_bindir}/%{pkgname}ParseJava +%{_bindir}/%{pkgname}WrapJava +%{_bindir}/%{pkgname}WrapPython +%{_bindir}/%{pkgname}WrapPythonInit +%{_bindir}/%{pkgname}WrapTcl +%{_bindir}/%{pkgname}WrapTclInit %if %{compat_gl} %{_bindir}/%{pkgname}ParseOGLExt %endif @@ -463,8 +466,6 @@ chrpath -d %{buildroot}%{_bindir}/* %files java %defattr(-,root,root,-) -%{_bindir}/%{pkgname}ParseJava -%{_bindir}/%{pkgname}WrapJava %{_libdir}/%{pkgname}.jar %{_libdir}/libvtkViewsGeovisJava.so @@ -472,15 +473,11 @@ chrpath -d %{buildroot}%{_bindir}/* %defattr(-,root,root,-) %{_bindir}/%{pkgname}python %{_bindir}/p%{pkgname}python -%{_bindir}/%{pkgname}WrapPython -%{_bindir}/%{pkgname}WrapPythonInit %{python3_sitearch}/%{pkgname}/ %files tcl %defattr(-,root,root,-) %{_bindir}/%{pkgname} -%{_bindir}/%{pkgname}WrapTcl -%{_bindir}/%{pkgname}WrapTclInit %{_datadir}/tcl/%{pkgname}/ %files qt diff --git a/vtk.changes b/vtk.changes index 1bfe2d9..7f9afa1 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 14 20:54:34 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Remove the various subpackage Requires from the devel package + again. The qt subpackage contains a Qt Designer plugin and no + dependency at all. Package the vtkWrap{Tcl,Java,Python} wrapper + generators in the devel package, as these are useless without + the vtk headers files. +- Fix description/summary of vtk-qt subpackage + ------------------------------------------------------------------- Tue Sep 12 12:33:38 UTC 2017 - kkhere.geo@gmail.com diff --git a/vtk.spec b/vtk.spec index ac02dd8..326e6ec 100644 --- a/vtk.spec +++ b/vtk.spec @@ -144,9 +144,6 @@ This package provides the shared libraries for VTK. %package devel Summary: VTK header files for building C++ code Group: Development/Libraries/C and C++ -Requires: %{name}-java = %{version} -Requires: %{name}-qt = %{version} -Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} Requires: Mesa-libGL-devel Requires: R-base-devel @@ -221,7 +218,7 @@ rendering and visualization. This package provides python bindings for VTK. %package qt -Summary: Qt VTK widget +Summary: Qt Designer plugin for QVTKWidget Group: Development/Libraries/C and C++ Requires: %{shlib} = %{version} %if %{compat_gl} @@ -235,7 +232,7 @@ Conflicts: vtk-compat_gl-qt VTK is a software system for image processing, 3D graphics, volume rendering and visualization. -This package provides Qt bindings for VTK. +This package provides a Qt Designer plugin for the QVTKWidget. %package tcl Summary: Tcl bindings for VTK @@ -441,6 +438,12 @@ chrpath -d %{buildroot}%{_bindir}/* %{_bindir}/%{pkgname}EncodeString %{_bindir}/%{pkgname}HashSource %{_bindir}/%{pkgname}WrapHierarchy +%{_bindir}/%{pkgname}ParseJava +%{_bindir}/%{pkgname}WrapJava +%{_bindir}/%{pkgname}WrapPython +%{_bindir}/%{pkgname}WrapPythonInit +%{_bindir}/%{pkgname}WrapTcl +%{_bindir}/%{pkgname}WrapTclInit %if %{compat_gl} %{_bindir}/%{pkgname}ParseOGLExt %endif @@ -463,8 +466,6 @@ chrpath -d %{buildroot}%{_bindir}/* %files java %defattr(-,root,root,-) -%{_bindir}/%{pkgname}ParseJava -%{_bindir}/%{pkgname}WrapJava %{_libdir}/%{pkgname}.jar %{_libdir}/libvtkViewsGeovisJava.so @@ -472,15 +473,11 @@ chrpath -d %{buildroot}%{_bindir}/* %defattr(-,root,root,-) %{_bindir}/%{pkgname}python %{_bindir}/p%{pkgname}python -%{_bindir}/%{pkgname}WrapPython -%{_bindir}/%{pkgname}WrapPythonInit %{python3_sitearch}/%{pkgname}/ %files tcl %defattr(-,root,root,-) %{_bindir}/%{pkgname} -%{_bindir}/%{pkgname}WrapTcl -%{_bindir}/%{pkgname}WrapTclInit %{_datadir}/tcl/%{pkgname}/ %files qt