Hello community,
here is the log from the commit of package vtk for openSUSE:Factory checked in
at 2020-02-03 11:13:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vtk (Old)
and /work/SRC/openSUSE:Factory/.vtk.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk"
Mon Feb 3 11:13:51 2020 rev:44 rq:769140 version:8.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2019-11-07 23:19:08.236704412
+0100
+++ /work/SRC/openSUSE:Factory/.vtk.new.26092/vtk.changes 2020-02-03
11:13:51.853861487 +0100
@@ -1,0 +2,10 @@
+Tue Jan 28 22:45:34 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Add openmpi3 flavor.
+- Disable openmpi1 for SLE/Leap 15.2, openmpi3 for SLE <= 15.1
+- Adjust disk _constraints.
+- Drop vtk-fix-file-contains-date-time.patch, GCC honors
+ SOURCE_DATE_EPOCH.
+- Drop unused netcdf-c++-devel BuildRequires.
+
+-------------------------------------------------------------------
Old:
----
vtk-fix-file-contains-date-time.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vtk.spec ++++++
--- /var/tmp/diff_new_pack.BMRHje/_old 2020-02-03 11:13:53.873862508 +0100
+++ /var/tmp/diff_new_pack.BMRHje/_new 2020-02-03 11:13:53.873862508 +0100
@@ -1,7 +1,7 @@
#
# spec file for package vtk
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,13 @@
%global flavor @BUILD_FLAVOR@%{nil}
+%if 0%{?sle_version} >= 150200
+%define DisOMPI1 ExclusiveArch: do_not_build
+%endif
+%if !0%{?is_opensuse} && 0%{?sle_version:1} && 0%{?sle_version} < 150200
+%define DisOMPI3 ExclusiveArch: do_not_build
+%endif
+
%define pkgname vtk
%if 0%{?suse_version} <= 1500
@@ -39,6 +46,7 @@
%endif
%if "%{flavor}" == "openmpi"
+%{?DisOMPI1}
%if 0%{?suse_version} >= 1550
%define my_suffix -openmpi1
%define mpi_flavor openmpi1
@@ -55,6 +63,13 @@
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif
+%if "%{flavor}" == "openmpi3"
+%{?DisOMPI3}
+%define my_suffix -openmpi3
+%define mpi_flavor openmpi3
+%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
+%endif
+
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
%if %{with mpi}
@@ -83,8 +98,6 @@
# FIXME See if packaging can be tweaked to accommodate python-vtk's devel
files in a devel package later
# We need to use the compat conditionals here to avoid Factory's source
validator from tripping up
Source99: vtk-rpmlintrc
-# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch
badshah...@gmail.com -- Fix file containing DATE and TIME
-Patch1: vtk-fix-file-contains-date-time.patch
# PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue
#17113 stefan.bru...@rwth-aachen.de -- Fix building with Qt GLES builds
Patch2: 0001-Allow-compilation-on-GLES-platforms.patch
# PATCH-FIX-OPENSUSE bundled_libharu_add_missing_libm.patch
stefan.bru...@rwth-aachen.de -- Add missing libm for linking
@@ -112,12 +125,17 @@
%endif
BuildRequires: hdf5-devel
BuildRequires: java-devel
+BuildRequires: libboost_graph-devel
+BuildRequires: libboost_graph_parallel-devel
+BuildRequires: libboost_serialization-devel
+%if %{with mpi}
+BuildRequires: libboost_mpi-devel
+%endif
%if %{with haru}
BuildRequires: libharu-devel > 2.3.0
%endif
BuildRequires: libjpeg-devel
BuildRequires: libmysqlclient-devel
-BuildRequires: libnetcdf_c++-devel
BuildRequires: libtiff-devel
%if %{with mpi}
BuildRequires: %{mpi_flavor}-devel
@@ -164,12 +182,6 @@
BuildRequires: pkgconfig(tk)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(zlib)
-BuildRequires: libboost_graph-devel
-BuildRequires: libboost_graph_parallel-devel
-%if %{with mpi}
-BuildRequires: libboost_mpi-devel
-%endif
-BuildRequires: libboost_serialization-devel
%description
VTK is a software system for image processing, 3D graphics, volume
@@ -332,7 +344,6 @@
%prep
%setup -q -n VTK-%{version}
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.BMRHje/_old 2020-02-03 11:13:53.917862531 +0100
+++ /var/tmp/diff_new_pack.BMRHje/_new 2020-02-03 11:13:53.917862531 +0100
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
- <size unit="G">8</size>
+ <size unit="G">12</size>
</disk>
</hardware>
</constraints>
++++++ _multibuild ++++++
--- /var/tmp/diff_new_pack.BMRHje/_old 2020-02-03 11:13:53.933862539 +0100
+++ /var/tmp/diff_new_pack.BMRHje/_new 2020-02-03 11:13:53.933862539 +0100
@@ -1,4 +1,5 @@
<multibuild>
<package>openmpi</package>
<package>openmpi2</package>
+ <package>openmpi3</package>
</multibuild>
