From e363b6ae65924fe7d576c12fed7d0c7f8b71de33cdfea1540e87433106da4ca4 Mon Sep 17 00:00:00 2001 From: Vicente Adolfo Bolea Sanchez Date: Wed, 7 Dec 2022 18:57:07 +0000 Subject: [PATCH] Accepting request 1040789 from home:badshah400:branches:science - Build with system verdict for openSUSE > 1500. OBS-URL: https://build.opensuse.org/request/show/1040789 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=112 --- paraview.changes | 5 +++++ paraview.spec | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/paraview.changes b/paraview.changes index 3ffe955..48ef61a 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 6 18:50:30 UTC 2022 - Atri Bhattacharya + +- Build with system verdict for openSUSE > 1500. + ------------------------------------------------------------------- Wed Nov 30 16:40:06 UTC 2022 - Atri Bhattacharya diff --git a/paraview.spec b/paraview.spec index 64421fc..b5d42ae 100644 --- a/paraview.spec +++ b/paraview.spec @@ -23,8 +23,10 @@ %if 0%{?suse_version} <= 1500 %bcond_with pugixml +%bcond_with verdict %else %bcond_without pugixml +%bcond_without verdict %endif %if 0%{?sle_version} == 150300 && 0%{?is_opensuse} @@ -124,6 +126,9 @@ BuildRequires: pkgconfig(proj) %if %{with pugixml} BuildRequires: pkgconfig(pugixml) >= 1.11 %endif +%if %{with verdict} +BuildRequires: verdict-devel +%endif %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150300 BuildRequires: cli11-devel %else @@ -236,7 +241,7 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe -DVTK_MODULE_USE_EXTERNAL_VTK_libproj=%{?with_proj:ON}%{!?with_proj:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=%{?with_nlohmann:ON}%{!?with_nlohmann:OFF} \ -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \ - -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=OFF \ + -DVTK_MODULE_USE_EXTERNAL_VTK_verdict=%{?with_verdict:ON}%{!?with_verdict:OFF} \ %{nil} %cmake_build