From ecf85944471b2066121ecef61191066881ee22dbbcd864a6c71c4bc1373c747f Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 5 Apr 2022 16:34:46 +0000 Subject: [PATCH 1/2] Accepting request 967112 from home:vicentebolea - Fixes cli11 dependency for 15.3. - Drops system gl2ps on Leap 15.x since a higher version of gl2ps is needed than the system provided version on Leap 15.x. OBS-URL: https://build.opensuse.org/request/show/967112 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=103 --- paraview.changes | 7 +++++++ paraview.spec | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/paraview.changes b/paraview.changes index 9c211cd..6bfecc9 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 04 12:00:00 UTC 2022 - Vicente Adolfo Bolea Sanchez + +- Fixes cli11 dependency for 15.3. +- Drops system gl2ps on Leap 15.x since a higher version of gl2ps is needed than the + system provided version on Leap 15.x. + ------------------------------------------------------------------- Thu Mar 17 13:40:21 UTC 2022 - Atri Bhattacharya diff --git a/paraview.spec b/paraview.spec index ce32de8..e2c8a5e 100644 --- a/paraview.spec +++ b/paraview.spec @@ -23,10 +23,12 @@ %if 0%{?suse_version} <= 1500 %bcond_with pugixml +%bcond_with gl2ps %else %bcond_without pugixml -%endif %bcond_without gl2ps +%endif + # Need patched version with HPDF_SHADING %bcond_with haru @@ -79,7 +81,6 @@ BuildRequires: python3-qt5-devel BuildRequires: readline-devel BuildRequires: utfcpp-devel BuildRequires: wget -BuildRequires: pkgconfig(CLI11) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Help) @@ -106,6 +107,11 @@ BuildRequires: pkgconfig(protobuf) >= 2.6.0 %if %{with pugixml} BuildRequires: pkgconfig(pugixml) >= 1.11 %endif +%if 0%{?suse_version} <= 1500 +BuildRequires: cli11-devel +%else +BuildRequires: pkgconfig(CLI11) +%endif BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) From be5e3722215f6e928af732fe51de234a8281ecb8feddc14158de8a2856ae8019 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 5 Apr 2022 16:35:04 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=104 --- paraview.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/paraview.changes b/paraview.changes index 6bfecc9..255beb4 100644 --- a/paraview.changes +++ b/paraview.changes @@ -2,8 +2,8 @@ Mon Apr 04 12:00:00 UTC 2022 - Vicente Adolfo Bolea Sanchez - Fixes cli11 dependency for 15.3. -- Drops system gl2ps on Leap 15.x since a higher version of gl2ps is needed than the - system provided version on Leap 15.x. +- Drops system gl2ps on Leap 15.x since a higher version of gl2ps + is needed than the system provided version on Leap 15.x. ------------------------------------------------------------------- Thu Mar 17 13:40:21 UTC 2022 - Atri Bhattacharya