From 895aefe3883b712b94e510258718cecf5efa693280c388fd511d93935854e972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 12 Oct 2017 16:20:25 +0000 Subject: [PATCH 1/4] Accepting request 530507 from home:StefanBruens:branches:science - Move the vtk binary to the tcl subpackage, it is an interactive TCL shell, and depends on the TCL bindings. It can be used standalone from the devel package. Dito for its MPI variant, i.e. the pvtk binary. - Move all libvtk*Java.so to the java subpackage. These are part of the Java bindings, i.e. runtime dependencies. Otherwise, the java subpacakge depends on the devel subpackage. - Add the tcl and java subpackage to the devel requires again. Although not stricly necessary until building java or tcl packages, the cmake files have a hard dependency on several build artifacts provided by the tcl and java subpackages. Split devel packages for the bindings would be preferred, but this is not supported by the upstream build system. - Remove the openmpi-devel requires in the python subpackage, the mpi runtime libraries are provided by openmpi-libs, which is picked up automatically. - Split the API documentation from the development subpackage. The documentation amounts to almost 1 GByte of data, not necessary when just building packages. - Move the vtk binary to the tcl subpackage, it is an interactive TCL shell, and depends on the TCL bindings. It can be used standalone from the devel package. Dito for its MPI variant, i.e. the pvtk binary. - Move all libvtk*Java.so to the java subpackage. These are part of the Java bindings, i.e. runtime dependencies. Otherwise, the java subpacakge depends on the devel subpackage. - Add the tcl and java subpackage to the devel requires again. Although not stricly necessary until building java or tcl packages, the cmake files have a hard dependency on several build artifacts provided by the tcl and java subpackages. Split devel packages for the bindings would be preferred, but this is not supported by the upstream build system. - Remove the openmpi-devel requires in the python subpackage, the mpi runtime libraries are provided by openmpi-libs, which is picked up automatically. - Split the API documentation from the development subpackage. The documentation amounts to almost 1 GByte of data, not necessary when just building packages. OBS-URL: https://build.opensuse.org/request/show/530507 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=102 --- vtk-compat_gl.changes | 27 +++++++++++++++++++++++++++ vtk-compat_gl.spec | 28 +++++++++++++++++++++++----- vtk.changes | 27 +++++++++++++++++++++++++++ vtk.spec | 28 +++++++++++++++++++++++----- 4 files changed, 100 insertions(+), 10 deletions(-) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index c51c783..4c55a2d 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sun Oct 1 20:36:49 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Move the vtk binary to the tcl subpackage, it is an interactive + TCL shell, and depends on the TCL bindings. It can be used + standalone from the devel package. Dito for its MPI variant, i.e. + the pvtk binary. +- Move all libvtk*Java.so to the java subpackage. These are part of + the Java bindings, i.e. runtime dependencies. Otherwise, the java + subpacakge depends on the devel subpackage. +- Add the tcl and java subpackage to the devel requires again. + Although not stricly necessary until building java or tcl packages, + the cmake files have a hard dependency on several build artifacts + provided by the tcl and java subpackages. Split devel packages + for the bindings would be preferred, but this is not supported by + the upstream build system. +- Remove the openmpi-devel requires in the python subpackage, the + mpi runtime libraries are provided by openmpi-libs, which is + picked up automatically. + +------------------------------------------------------------------- +Sun Oct 01 17:04:57 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Split the API documentation from the development subpackage. The + documentation amounts to almost 1 GByte of data, not necessary + when just building packages. + ------------------------------------------------------------------- Thu Sep 28 10:43:27 UTC 2017 - badshah400@gmail.com diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 66cf04e..e2699bb 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -139,7 +139,10 @@ 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++ +Requires: %{name}-java = %{version} +Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} Requires: Mesa-libGL-devel Requires: R-base-devel @@ -177,6 +180,17 @@ rendering and visualization. This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. +%package devel-doc +Summary: VTK API documentation +Group: Development/Libraries/C and C++ + +%description devel-doc +VTK is a software system for image processing, 3D graphics, volume +rendering and visualization. + +This provides the VTK API documentation useful for developing programs that +use VTK to do 3D visualisation. + %package java Summary: Java bindings for VTK Group: Development/Libraries/Java @@ -198,8 +212,6 @@ This package provides java bindings for VTK. Summary: Python bindings for VTK Group: Development/Languages/Python Requires: %{shlib} = %{version} -# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN -Requires: openmpi-devel %if %{compat_gl} Conflicts: python3-vtk Provides: python3-vtk @@ -431,7 +443,6 @@ chrpath -d %{buildroot}%{_bindir}/* %files devel %defattr(-,root,root,-) %doc Copyright.txt -%{_bindir}/%{pkgname} %{_bindir}/%{pkgname}EncodeString %{_bindir}/%{pkgname}HashSource %{_bindir}/%{pkgname}WrapHierarchy @@ -444,11 +455,9 @@ chrpath -d %{buildroot}%{_bindir}/* %if %{compat_gl} %{_bindir}/%{pkgname}ParseOGLExt %endif -%{_bindir}/pvtk %if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 %{_bindir}/%{pkgname}mkg3states %endif -%{_datadir}/doc/%{pkgname}-%{series}/ %{_libdir}/*.so %if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 %{_libdir}/libvtktiff.so @@ -456,11 +465,18 @@ chrpath -d %{buildroot}%{_bindir}/* %{_libdir}/cmake/%{pkgname}/ %{_libdir}/libvtkWrappingTools.a %{_includedir}/%{pkgname}-%{series}/ +# VTK JNI bindings +%exclude %{_libdir}/libvtk*Java.so %exclude %{_datadir}/tcl/vtk/vtktcl.c +%files devel-doc +%defattr(-,root,root,-) +%{_datadir}/doc/%{pkgname}-%{series}/ + %files java %defattr(-,root,root,-) %{_libdir}/%{pkgname}.jar +%{_libdir}/libvtk*Java.so %files -n python3-%{name} %defattr(-,root,root,-) @@ -470,6 +486,8 @@ chrpath -d %{buildroot}%{_bindir}/* %files tcl %defattr(-,root,root,-) +%{_bindir}/%{pkgname} +%{_bindir}/p%{pkgname} %{_datadir}/tcl/%{pkgname}/ %files qt diff --git a/vtk.changes b/vtk.changes index c51c783..4c55a2d 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sun Oct 1 20:36:49 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Move the vtk binary to the tcl subpackage, it is an interactive + TCL shell, and depends on the TCL bindings. It can be used + standalone from the devel package. Dito for its MPI variant, i.e. + the pvtk binary. +- Move all libvtk*Java.so to the java subpackage. These are part of + the Java bindings, i.e. runtime dependencies. Otherwise, the java + subpacakge depends on the devel subpackage. +- Add the tcl and java subpackage to the devel requires again. + Although not stricly necessary until building java or tcl packages, + the cmake files have a hard dependency on several build artifacts + provided by the tcl and java subpackages. Split devel packages + for the bindings would be preferred, but this is not supported by + the upstream build system. +- Remove the openmpi-devel requires in the python subpackage, the + mpi runtime libraries are provided by openmpi-libs, which is + picked up automatically. + +------------------------------------------------------------------- +Sun Oct 01 17:04:57 UTC 2017 - stefan.bruens@rwth-aachen.de + +- Split the API documentation from the development subpackage. The + documentation amounts to almost 1 GByte of data, not necessary + when just building packages. + ------------------------------------------------------------------- Thu Sep 28 10:43:27 UTC 2017 - badshah400@gmail.com diff --git a/vtk.spec b/vtk.spec index 73a8e80..09f802c 100644 --- a/vtk.spec +++ b/vtk.spec @@ -139,7 +139,10 @@ 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++ +Requires: %{name}-java = %{version} +Requires: %{name}-tcl = %{version} Requires: %{shlib} = %{version} Requires: Mesa-libGL-devel Requires: R-base-devel @@ -177,6 +180,17 @@ rendering and visualization. This provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. +%package devel-doc +Summary: VTK API documentation +Group: Development/Libraries/C and C++ + +%description devel-doc +VTK is a software system for image processing, 3D graphics, volume +rendering and visualization. + +This provides the VTK API documentation useful for developing programs that +use VTK to do 3D visualisation. + %package java Summary: Java bindings for VTK Group: Development/Libraries/Java @@ -198,8 +212,6 @@ This package provides java bindings for VTK. Summary: Python bindings for VTK Group: Development/Languages/Python Requires: %{shlib} = %{version} -# DESPITE NOT BEING A DEVEL PACKAGE, THIS REQUIRES OPENMPI-DEVEL TO RUN -Requires: openmpi-devel %if %{compat_gl} Conflicts: python3-vtk Provides: python3-vtk @@ -431,7 +443,6 @@ chrpath -d %{buildroot}%{_bindir}/* %files devel %defattr(-,root,root,-) %doc Copyright.txt -%{_bindir}/%{pkgname} %{_bindir}/%{pkgname}EncodeString %{_bindir}/%{pkgname}HashSource %{_bindir}/%{pkgname}WrapHierarchy @@ -444,11 +455,9 @@ chrpath -d %{buildroot}%{_bindir}/* %if %{compat_gl} %{_bindir}/%{pkgname}ParseOGLExt %endif -%{_bindir}/pvtk %if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 %{_bindir}/%{pkgname}mkg3states %endif -%{_datadir}/doc/%{pkgname}-%{series}/ %{_libdir}/*.so %if 0%{?suse_version} <= 1320 && 0%{?suse_version} != 1315 %{_libdir}/libvtktiff.so @@ -456,11 +465,18 @@ chrpath -d %{buildroot}%{_bindir}/* %{_libdir}/cmake/%{pkgname}/ %{_libdir}/libvtkWrappingTools.a %{_includedir}/%{pkgname}-%{series}/ +# VTK JNI bindings +%exclude %{_libdir}/libvtk*Java.so %exclude %{_datadir}/tcl/vtk/vtktcl.c +%files devel-doc +%defattr(-,root,root,-) +%{_datadir}/doc/%{pkgname}-%{series}/ + %files java %defattr(-,root,root,-) %{_libdir}/%{pkgname}.jar +%{_libdir}/libvtk*Java.so %files -n python3-%{name} %defattr(-,root,root,-) @@ -470,6 +486,8 @@ chrpath -d %{buildroot}%{_bindir}/* %files tcl %defattr(-,root,root,-) +%{_bindir}/%{pkgname} +%{_bindir}/p%{pkgname} %{_datadir}/tcl/%{pkgname}/ %files qt From 6d5fcfd66047038208b5cfee05da5e663ecf99dfe4831f037c6503cd62644247 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Sun, 15 Oct 2017 09:30:41 +0000 Subject: [PATCH 2/4] Accepting request 533752 from home:jengelh:branches:science - Rectify RPM groups again. OBS-URL: https://build.opensuse.org/request/show/533752 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=103 --- vtk-compat_gl.changes | 5 +++++ vtk-compat_gl.spec | 2 +- vtk.changes | 5 +++++ vtk.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index 4c55a2d..47e17b3 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 12 20:47:27 UTC 2017 - jengelh@inai.de + +- Rectify RPM groups again. + ------------------------------------------------------------------- Sun Oct 1 20:36:49 UTC 2017 - stefan.bruens@rwth-aachen.de diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index e2699bb..6d4a5eb 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -182,7 +182,7 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation -Group: Development/Libraries/C and C++ +Group: Documentation/HTML %description devel-doc VTK is a software system for image processing, 3D graphics, volume diff --git a/vtk.changes b/vtk.changes index 4c55a2d..47e17b3 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 12 20:47:27 UTC 2017 - jengelh@inai.de + +- Rectify RPM groups again. + ------------------------------------------------------------------- Sun Oct 1 20:36:49 UTC 2017 - stefan.bruens@rwth-aachen.de diff --git a/vtk.spec b/vtk.spec index 09f802c..21ccc52 100644 --- a/vtk.spec +++ b/vtk.spec @@ -182,7 +182,7 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation -Group: Development/Libraries/C and C++ +Group: Documentation/HTML %description devel-doc VTK is a software system for image processing, 3D graphics, volume From 41a160bb5445ff50627cd7152eecd32a448312dc6b25e472b3522efaf65845e6 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 25 Oct 2017 08:37:28 +0000 Subject: [PATCH 3/4] Accepting request 536369 from home:dimstar:Factory - Setup MPI environment before building. - Setup MPI environment before building. OBS-URL: https://build.opensuse.org/request/show/536369 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=104 --- vtk-compat_gl.changes | 5 +++++ vtk-compat_gl.spec | 4 ++++ vtk.changes | 5 +++++ vtk.spec | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index 47e17b3..3786913 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org + +- Setup MPI environment before building. + ------------------------------------------------------------------- Thu Oct 12 20:47:27 UTC 2017 - jengelh@inai.de diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 6d4a5eb..8865b3a 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -310,6 +310,10 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\. export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" +if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then + source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh +fi + mkdir build pushd build cmake .. \ diff --git a/vtk.changes b/vtk.changes index 47e17b3..3786913 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org + +- Setup MPI environment before building. + ------------------------------------------------------------------- Thu Oct 12 20:47:27 UTC 2017 - jengelh@inai.de diff --git a/vtk.spec b/vtk.spec index 21ccc52..c5c7bbe 100644 --- a/vtk.spec +++ b/vtk.spec @@ -310,6 +310,10 @@ grep -rl '\.\./\.\./\.\./\.\./VTKData' . | xargs -r perl -pi -e's,\.\./\.\./\.\. export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" +if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then + source %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh +fi + mkdir build pushd build cmake .. \ From 51ab44ad1e4134414927ff633d07c24906dd33bb1b4c12378d7fc9afc3ee806f Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Thu, 26 Oct 2017 12:17:25 +0000 Subject: [PATCH 4/4] Accepting request 536738 from home:dimstar:Factory - Add conflict between the -devel-doc variants. - Add conflict between the -devel-doc variants. OBS-URL: https://build.opensuse.org/request/show/536738 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=105 --- vtk-compat_gl.changes | 5 +++++ vtk-compat_gl.spec | 4 ++++ vtk.changes | 5 +++++ vtk.spec | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/vtk-compat_gl.changes b/vtk-compat_gl.changes index 3786913..a030baf 100644 --- a/vtk-compat_gl.changes +++ b/vtk-compat_gl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org + +- Add conflict between the -devel-doc variants. + ------------------------------------------------------------------- Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org diff --git a/vtk-compat_gl.spec b/vtk-compat_gl.spec index 8865b3a..77787a0 100644 --- a/vtk-compat_gl.spec +++ b/vtk-compat_gl.spec @@ -183,6 +183,10 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation Group: Documentation/HTML +%if %compat_gl +# vtk and vtk-compat_gl have the same set of documentation. +Conflicts: vtk-devel-doc +%endif %description devel-doc VTK is a software system for image processing, 3D graphics, volume diff --git a/vtk.changes b/vtk.changes index 3786913..a030baf 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 26 08:48:16 UTC 2017 - dimstar@opensuse.org + +- Add conflict between the -devel-doc variants. + ------------------------------------------------------------------- Tue Oct 24 11:55:17 UTC 2017 - dimstar@opensuse.org diff --git a/vtk.spec b/vtk.spec index c5c7bbe..ff4a537 100644 --- a/vtk.spec +++ b/vtk.spec @@ -183,6 +183,10 @@ use VTK to do 3D visualisation. %package devel-doc Summary: VTK API documentation Group: Documentation/HTML +%if %compat_gl +# vtk and vtk-compat_gl have the same set of documentation. +Conflicts: vtk-devel-doc +%endif %description devel-doc VTK is a software system for image processing, 3D graphics, volume