From 03cc6fafd73bd80a37505733b4260f96d67f5abc05fb2a00d9220822a626c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Sun, 19 Feb 2023 20:46:42 +0000 Subject: [PATCH] Accepting request 1066442 from home:StefanBruens:branches:science - Update to version 9.2.6, see: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md - Use bundled pegtl on TW, version 3.x is API incompatible with required pegtl 2.x. OBS-URL: https://build.opensuse.org/request/show/1066442 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=180 --- VTK-9.2.5.tar.gz | 3 --- VTK-9.2.6.tar.gz | 3 +++ vtk.changes | 8 ++++++++ vtk.spec | 10 ++++++---- 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 VTK-9.2.5.tar.gz create mode 100644 VTK-9.2.6.tar.gz diff --git a/VTK-9.2.5.tar.gz b/VTK-9.2.5.tar.gz deleted file mode 100644 index b24b2bd..0000000 --- a/VTK-9.2.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:128d601baa980e98ee034207974b33fb38d2c98ab9cf4a5756efdb09ed6c0949 -size 53807732 diff --git a/VTK-9.2.6.tar.gz b/VTK-9.2.6.tar.gz new file mode 100644 index 0000000..66ef51c --- /dev/null +++ b/VTK-9.2.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12 +size 53810904 diff --git a/vtk.changes b/vtk.changes index 12fadf5..4e95acc 100644 --- a/vtk.changes +++ b/vtk.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Feb 18 02:07:33 UTC 2023 - Stefan Brüns + +- Update to version 9.2.6, see: + https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.2.md +- Use bundled pegtl on TW, version 3.x is API incompatible with + required pegtl 2.x. + ------------------------------------------------------------------- Fri Jan 27 03:50:47 UTC 2023 - Stefan Brüns diff --git a/vtk.spec b/vtk.spec index 0f5c975..1ef2791 100644 --- a/vtk.spec +++ b/vtk.spec @@ -33,19 +33,21 @@ # pugixml in Leap 15.x is too old # fmt in Leap 15.x is too old # Need haru/hpdf version with HPDF_SHADING, i.e. >= 2.4.0 +# PEGTL >= 3.0 not supported, https://gitlab.kitware.com/vtk/vtk/-/issues/18151 %if 0%{?suse_version} <= 1500 %bcond_with fmt %bcond_with haru +%bcond_without pegtl %bcond_with pugixml %else %bcond_without fmt %bcond_without haru +%bcond_with pegtl %bcond_without pugixml %endif %bcond_without gl2ps %bcond_without java -%bcond_without pegtl %if "%{flavor}" == "" %define my_suffix %{nil} @@ -90,7 +92,7 @@ %define shlib %{vtklib} Name: vtk%{?my_suffix} -Version: 9.2.5 +Version: 9.2.6 Release: 0 %define series 9.2 Summary: The Visualization Toolkit - A high level 3D visualization library @@ -192,7 +194,7 @@ BuildRequires: python3-mpi4py-devel BuildRequires: pkgconfig(pugixml) >= 1.11 %endif %if %{with pegtl} -BuildRequires: pegtl-devel >= 2.0.0 +BuildRequires: (pegtl-devel >= 2.0.0 with pegtl-devel < 3.0) %endif %if %{with testing} BuildRequires: cli11-devel @@ -266,7 +268,7 @@ Requires: pkgconfig(netcdf) Requires: pkgconfig(theora) Requires: pkgconfig(zlib) %if %{with pegtl} -Requires: pegtl-devel +Requires: (pegtl-devel >= 2.0.0 with pegtl-devel < 3.0) %endif %if %{with pugixml} Requires: pkgconfig(pugixml) >= 1.11