rpm/vtk
SHA256
1
0
Fork 0
forked from pool/vtk
Code Pull Requests Activity

Accepting request 1122205 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1122205
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vtk?expand=0&rev=59
This commit is contained in:
Ana Guerrero 2023-11-02 19:22:16 +00:00 committed by Git OBS Bridge
commit 83f55c4624
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_multibuild
View File

@ -1,5 +1,3 @@
<multibuild> <multibuild>
<package>openmpi2</package>
<package>openmpi3</package>
<package>openmpi4</package> <package>openmpi4</package>
</multibuild> </multibuild>

11
vtk.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 31 22:56:50 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Tue Oct 24 08:06:01 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
- Drop support for obsolete openmpi[123]
- Prepare support for openmpi5
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de> Tue Apr 4 08:52:20 UTC 2023 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

26
vtk.spec
View File

@ -58,19 +58,6 @@
%define my_datadir %_datadir %define my_datadir %_datadir
%endif %endif
%if "%{flavor}" == "openmpi2"
%define my_suffix -openmpi2
%define mpi_flavor openmpi2
%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
%if "%{flavor}" == "openmpi4" %if "%{flavor}" == "openmpi4"
%{?DisOMPI4} %{?DisOMPI4}
%define my_suffix -openmpi4 %define my_suffix -openmpi4
@ -78,6 +65,13 @@
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor} %define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif %endif
%if "%{flavor}" == "openmpi5"
%{?DisOMPI5}
%define my_suffix -openmpi5
%define mpi_flavor openmpi5
%define mpiprefix %{_libdir}/mpi/gcc/%{mpi_flavor}
%endif
%{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}} %{?mpi_flavor:%{bcond_without mpi}}%{!?mpi_flavor:%{bcond_with mpi}}
%if %{with mpi} %if %{with mpi}
@ -183,7 +177,7 @@ BuildRequires: gl2ps-devel > 1.4.0
BuildRequires: libharu-devel >= 2.4.0 BuildRequires: libharu-devel >= 2.4.0
%endif %endif
%if %{with java} %if %{with java}
BuildRequires: java-devel BuildRequires: java-devel >= 1.8
%endif %endif
%if %{with mpi} %if %{with mpi}
BuildRequires: %{mpi_flavor}-devel BuildRequires: %{mpi_flavor}-devel
@ -292,7 +286,7 @@ Summary: Develoment files for VTK Java bindings
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Requires: %{name}-java = %{version} Requires: %{name}-java = %{version}
Requires: java-devel Requires: java-devel >= 1.8
Provides: %{name}-devel:%{my_libdir}/libvtkJava.so Provides: %{name}-devel:%{my_libdir}/libvtkJava.so
%description java-devel %description java-devel
@ -465,6 +459,8 @@ export CXXFLAGS="%{optflags}"
-DVTK_GROUP_ENABLE_Views=WANT \ -DVTK_GROUP_ENABLE_Views=WANT \
-DVTK_PYTHON_VERSION=3 \ -DVTK_PYTHON_VERSION=3 \
-DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \ -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \
-DVTK_JAVA_SOURCE_VERSION:STRING='1.8' \
-DVTK_JAVA_TARGET_VERSION:STRING='1.8' \
-DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \
-DOpenGL_GL_PREFERENCE:STRING='GLVND' \ -DOpenGL_GL_PREFERENCE:STRING='GLVND' \
-DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \ -DVTK_OPENGL_USE_GLES:BOOL=%{?with_gles:ON}%{!?with_gles:OFF} \