Hello community,
here is the log from the commit of package vtk for openSUSE:Factory checked in
at 2017-10-27 14:00:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vtk (Old)
and /work/SRC/openSUSE:Factory/.vtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk"
Fri Oct 27 14:00:55 2017 rev:30 rq:536862 version:8.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/vtk/vtk-compat_gl.changes 2017-10-09
19:40:36.247670632 +0200
+++ /work/SRC/openSUSE:Factory/.vtk.new/vtk-compat_gl.changes 2017-10-27
14:00:58.181284200 +0200
@@ -1,0 +2,42 @@
+Thu Oct 26 08:48:16 UTC 2017 - dims...@opensuse.org
+
+- Add conflict between the -devel-doc variants.
+
+-------------------------------------------------------------------
+Tue Oct 24 11:55:17 UTC 2017 - dims...@opensuse.org
+
+- Setup MPI environment before building.
+
+-------------------------------------------------------------------
+Thu Oct 12 20:47:27 UTC 2017 - jeng...@inai.de
+
+- Rectify RPM groups again.
+
+-------------------------------------------------------------------
+Sun Oct 1 20:36:49 UTC 2017 - stefan.bru...@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.bru...@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.
+
+-------------------------------------------------------------------
vtk.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vtk-compat_gl.spec ++++++
--- /var/tmp/diff_new_pack.tku7a2/_old 2017-10-27 14:01:01.049150138 +0200
+++ /var/tmp/diff_new_pack.tku7a2/_new 2017-10-27 14:01:01.053149951 +0200
@@ -139,7 +139,10 @@
%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,21 @@
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: 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
+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 +216,6 @@
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
@@ -298,6 +314,10 @@
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 .. \
@@ -431,7 +451,6 @@
%files devel
%defattr(-,root,root,-)
%doc Copyright.txt
-%{_bindir}/%{pkgname}
%{_bindir}/%{pkgname}EncodeString
%{_bindir}/%{pkgname}HashSource
%{_bindir}/%{pkgname}WrapHierarchy
@@ -444,11 +463,9 @@
%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 +473,18 @@
%{_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 +494,8 @@
%files tcl
%defattr(-,root,root,-)
+%{_bindir}/%{pkgname}
+%{_bindir}/p%{pkgname}
%{_datadir}/tcl/%{pkgname}/
%files qt
++++++ vtk.spec ++++++
--- /var/tmp/diff_new_pack.tku7a2/_old 2017-10-27 14:01:01.089148268 +0200
+++ /var/tmp/diff_new_pack.tku7a2/_new 2017-10-27 14:01:01.093148081 +0200
@@ -139,7 +139,10 @@
%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,21 @@
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: 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
+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 +216,6 @@
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
@@ -298,6 +314,10 @@
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 .. \
@@ -431,7 +451,6 @@
%files devel
%defattr(-,root,root,-)
%doc Copyright.txt
-%{_bindir}/%{pkgname}
%{_bindir}/%{pkgname}EncodeString
%{_bindir}/%{pkgname}HashSource
%{_bindir}/%{pkgname}WrapHierarchy
@@ -444,11 +463,9 @@
%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 +473,18 @@
%{_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 +494,8 @@
%files tcl
%defattr(-,root,root,-)
+%{_bindir}/%{pkgname}
+%{_bindir}/p%{pkgname}
%{_datadir}/tcl/%{pkgname}/
%files qt
