From 30a5a24500accd8485c3cc8823a7a4780eed207f64413e41a85e3350e3904e41 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Fri, 31 Jan 2020 16:21:56 +0000 Subject: [PATCH 1/2] Accepting request 768862 from home:StefanBruens:branches:science - 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. OBS-URL: https://build.opensuse.org/request/show/768862 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=146 --- _constraints | 2 +- _multibuild | 1 + vtk.changes | 10 ++++++++++ vtk.spec | 33 ++++++++++++++++++++++----------- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/_constraints b/_constraints index 085bc08..419aa3f 100644 --- a/_constraints +++ b/_constraints @@ -1,7 +1,7 @@ - 8 + 12 diff --git a/_multibuild b/_multibuild index 1ee3fb2..f9d8d70 100644 --- a/_multibuild +++ b/_multibuild @@ -1,4 +1,5 @@ openmpi openmpi2 + openmpi3 diff --git a/vtk.changes b/vtk.changes index 942ea8e..1b42948 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jan 28 22:45:34 UTC 2020 - Stefan Brüns + +- 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. + ------------------------------------------------------------------- Mon Nov 4 17:59:29 UTC 2019 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index 0949e78..bdf881b 100644 --- a/vtk.spec +++ b/vtk.spec @@ -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 @@ Source: https://www.vtk.org/files/release/%{series}/VTK-%{version}.tar.g # 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 badshah400@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.bruens@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.bruens@rwth-aachen.de -- Add missing libm for linking @@ -112,12 +125,17 @@ BuildRequires: hdf5-%{mpi_flavor}-devel %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(theora) 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 @@ languages. %prep %setup -q -n VTK-%{version} -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 From 2fd141c68523b1a8073a31c5b7cd3bbdb1647875d9ef0574eb148e0731b9de33 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Fri, 31 Jan 2020 16:29:20 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=147 --- vtk-fix-file-contains-date-time.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 vtk-fix-file-contains-date-time.patch diff --git a/vtk-fix-file-contains-date-time.patch b/vtk-fix-file-contains-date-time.patch deleted file mode 100644 index 773462e..0000000 --- a/vtk-fix-file-contains-date-time.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: VTK8.2.0/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c -=================================================================== ---- VTK8.2.0.orig/ThirdParty/netcdf/vtknetcdf/libdispatch/derror.c -+++ VTK8.2.0/ThirdParty/netcdf/vtknetcdf/libdispatch/derror.c -@@ -13,7 +13,7 @@ - #endif - - /* Tell the user the version of netCDF. */ --static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; -+static const char nc_libvers[] = PACKAGE_VERSION; - - /** - \defgroup lib_version Library Version