From 67ec0b1811a8a98f64667ad91a969c8c980fd6bfa92bdb047acea08a8f48600b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sat, 19 Mar 2022 22:08:06 +0000 Subject: [PATCH] Accepting request 961769 from home:StefanBruens:branches:science - Split java-devel subpackage from devel package, avoid pulling in Java on most builds. - Move python support libraries to python subpackage. - Use system gl2ps also on Leap 15.x OBS-URL: https://build.opensuse.org/request/show/961769 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=173 --- vtk.changes | 11 +++++++++++ vtk.spec | 39 ++++++++++++++++++++++++++++++--------- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/vtk.changes b/vtk.changes index d138708..6b5e917 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 10 22:01:28 UTC 2022 - Stefan Brüns + +- Split java-devel subpackage from devel package, avoid pulling + in Java on most builds. + +------------------------------------------------------------------- +Thu Feb 10 21:33:32 UTC 2022 - Stefan Brüns + +- Use system gl2ps also on Leap 15.x + ------------------------------------------------------------------- Thu Nov 18 04:03:36 UTC 2021 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index fb086b6..d13b021 100644 --- a/vtk.spec +++ b/vtk.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,15 +29,14 @@ %define pkgname vtk -# pugixml and gl2ps in Leap 15.x are too old +# pugixml in Leap 15.x is too old %if 0%{?suse_version} <= 1500 %bcond_with pugixml -%bcond_with gl2ps %else %bcond_without pugixml -%bcond_without gl2ps %endif +%bcond_without gl2ps %bcond_without java %bcond_without pegtl @@ -183,7 +182,7 @@ BuildRequires: netcdf-%{mpi_flavor}-devel BuildRequires: python3-mpi4py-devel %endif %if %{with pugixml} -BuildRequires: pkgconfig(pugixml) +BuildRequires: pkgconfig(pugixml) >= 1.11 %endif %if %{with pegtl} BuildRequires: pegtl-devel >= 2.0.0 @@ -215,7 +214,6 @@ This package provides the shared libraries for VTK. Summary: VTK header files for building C++ code # not strictly necessary, but required by VTKs cmake files Group: Development/Libraries/C and C++ -%{?with_java:Requires: %{name}-java = %{version}} Requires: %{name}-qt = %{version} Requires: %{shlib} = %{version} Requires: cgns-devel @@ -258,7 +256,7 @@ Requires: pkgconfig(zlib) Requires: pegtl-devel %endif %if %{with pugixml} -Requires: pugixml-devel +Requires: pkgconfig(pugixml) >= 1.11 %endif Conflicts: vtk-compat_gl-devel @@ -272,6 +270,23 @@ LOD control). This provides development libraries and header files required to compile C++ programs that use VTK to do 3D visualisation. +%package java-devel +Summary: Develoment files for VTK Java bindings +Group: Development/Libraries/C and C++ +Requires: %{name}-devel = %{version} +Requires: %{name}-java = %{version} +Requires: java-devel +Provides: %{name}-devel:%{my_bindir}/%{pkgname}WrapJava + +%description java-devel +VTK is a software system for image processing, 3D graphics, volume +rendering and visualization. VTK includes many advanced algorithms +(e.g. surface reconstruction, implicit modelling, decimation) and +rendering techniques (e.g. hardware-accelerated volume rendering, +LOD control). + +This provides the Java part of the development files. + %package devel-doc Summary: VTK API documentation Group: Documentation/HTML @@ -549,9 +564,7 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %if %{without gles} %{my_bindir}/vtkProbeOpenGLVersion %endif -%{my_bindir}/%{pkgname}ParseJava %{my_bindir}/%{pkgname}WrapHierarchy -%{my_bindir}/%{pkgname}WrapJava %{my_bindir}/%{pkgname}WrapPython %{my_bindir}/%{pkgname}WrapPythonInit %{my_libdir}/*.so @@ -561,6 +574,8 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %{my_incdir}/%{pkgname}-%{series}/ # VTK JNI %exclude %{my_libdir}/libvtk*Java.so +%exclude %{my_libdir}/cmake/%{pkgname}-%{series}/VTKJava-*.cmake +%exclude %{my_libdir}/cmake/%{pkgname}-%{series}/*WrapJava-*.cmake %if %{with documentation} %files devel-doc @@ -574,6 +589,12 @@ find %{buildroot} . -name vtk.cpython-3*.pyc -print -delete # drop unreproducibl %{my_libdir}/libvtk*Java.so %{my_libdir}/libvtk*Java.so.1 %{my_libdir}/java/ + +%files java-devel +%{my_bindir}/%{pkgname}WrapJava +%{my_bindir}/%{pkgname}ParseJava +%{my_libdir}/cmake/%{pkgname}-%{series}/VTKJava-*.cmake +%{my_libdir}/cmake/%{pkgname}-%{series}/*WrapJava*.cmake %endif %files -n python3-%{name}