From d8e957e901a46c36cc016f4051d02c6cc4716881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Fri, 27 Apr 2018 19:17:15 +0200 Subject: [PATCH] Add compatibility with GRASS 7.4 --- qgis.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/qgis.spec b/qgis.spec index 865405b..dfcc4ac 100644 --- a/qgis.spec +++ b/qgis.spec @@ -11,6 +11,12 @@ %endif %endif +%if 0%{?fedora} >= 27 +%define grass grass74 +%else +%define grass grass72 +%endif + #TODO: Run test suite (see debian/rules) Name: qgis @@ -215,9 +221,8 @@ gzip ChangeLog -D QGIS_MANUAL_SUBDIR=/share/man \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D WITH_BINDINGS:BOOL=TRUE \ - -D WITH_GRASS:BOOL=TRUE \ -D WITH_GRASS7:BOOL=TRUE \ - -D GRASS_PREFIX=%{_libdir}/grass \ + -D GRASS_PREFIX7=%{_libdir}/%{grass} \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \ -D ENABLE_TESTS:BOOL=FALSE \ @@ -407,6 +412,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Apr 27 2018 Daniele ViganĂ² - 2.18.19-2 +- Rebuild for GRASS 7.4 + * Mon Apr 23 2018 Daniele ViganĂ² - 2.18.19-1 - New upstream release