From 54805f2d68d62e1b4838824d9876e912754a6489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Devrim=20G=C3=BCnd=C3=BCz?= Date: Mon, 6 Jun 2016 17:38:07 +0300 Subject: [PATCH] Sync with rawhide spec. --- qgis.spec | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/qgis.spec b/qgis.spec index 229b81b..236ac9a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -11,11 +11,17 @@ %endif %endif + +# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though +# the soname might stay the same, it won't work anymore. +#http://hub.qgis.org/issues/5274 +%global grass_version 7.0.4 + #TODO: Run test suite (see debian/rules) Name: qgis Version: 2.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -50,7 +56,7 @@ BuildRequires: fcgi-devel BuildRequires: flex bison BuildRequires: gdal-devel BuildRequires: geos-devel -BuildRequires: grass-devel +BuildRequires: grass-devel = %{grass_version} BuildRequires: gsl-devel %ifarch ppc ppc64 @@ -127,12 +133,8 @@ Group: Applications/Engineering Requires: %{name}%{?_isa} = %{version}-%{release} # The plug-in requires more than just the grass-libs. -# This questions the sense of the libs package is questionable - -# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though -# the soname might stay the same, it won't work anymore. -#http://hub.qgis.org/issues/5274 -Requires: grass = 7.0.3 +# This questions the sense of the libs package. +Requires: grass %description grass GRASS plugin for QGIS required to interface with the GRASS system. @@ -406,6 +408,11 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Mon Jun 06 2016 Volker Froehlich - 2.14.3-2 +- Move grass version to BR. This will avoid building with a + different version than intended. The sub-package dependencies + is taken care of by soname versions. + * Mon May 23 2016 Volker Froehlich - 2.14.3-1 - New upstream release @@ -425,7 +432,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - Rebuild for GRASS 7.0.3 * Wed Mar 16 2016 Volker Froehlich - 2.14.0-3 -- Remove requires-filtering, masking a dependency for libgsl +- Build with Grass 7 +- Remove Requires-filtering, hiding the dependency on libgsl * Wed Mar 9 2016 Volker Froehlich - 2.14.0-2 - Add patch for upstream issue #14402 (MSSQL)