From 2a3a58a3c78a3691305d7ef99dd302e9dba9361c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 28 Sep 2020 11:18:00 -0700 Subject: [PATCH] build-system: update OBS spec file Just trying to keep things in sync with what we actually use in the automated builds. Signed-off-by: Dirk Hohndel --- packaging/OBS/subsurfacedaily.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec index 57da33a6e..586878fbd 100644 --- a/packaging/OBS/subsurfacedaily.spec +++ b/packaging/OBS/subsurfacedaily.spec @@ -4,9 +4,9 @@ # Copyright (c) 2014-2020 Dirk Hohndel # -%define latestVersion 4.9.3.1464 +%define latestVersion 4.9.7.6 -%define gitVersion 1464 +%define gitVersion 6 Name: subsurfacedaily @@ -29,7 +29,7 @@ BuildRequires: libtool BuildRequires: cmake %if 0%{?suse_version} # kde4-filesystem needed for some folders not owned (% {_datadir}/icons/hicolor and others) -BuildRequires: kde4-filesystem +BuildRequires: kf5-filesystem %endif BuildRequires: libzip-devel BuildRequires: libxml2-devel @@ -37,7 +37,14 @@ BuildRequires: libxslt-devel BuildRequires: libssh2-devel BuildRequires: libcurl-devel BuildRequires: libgit2-devel +%if 0%{?fedora_version} >= 30 +# current Fedora has Grantlee under a different name +# and F32 has a weird conflict with different boost-regex versions +BuildRequires: grantlee-qt5-devel +BuildRequires: boost-regex +%else BuildRequires: grantlee5-devel +%endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} BuildRequires: netpbm-devel BuildRequires: openssl-devel