Sync with rawhide spec.

This commit is contained in:
Devrim Gündüz 2016-06-06 17:38:07 +03:00
parent 392b1a2812
commit 54805f2d68
1 changed files with 17 additions and 9 deletions

View File

@ -11,11 +11,17 @@
%endif %endif
%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) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.14.3 Version: 2.14.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -50,7 +56,7 @@ BuildRequires: fcgi-devel
BuildRequires: flex bison BuildRequires: flex bison
BuildRequires: gdal-devel BuildRequires: gdal-devel
BuildRequires: geos-devel BuildRequires: geos-devel
BuildRequires: grass-devel BuildRequires: grass-devel = %{grass_version}
BuildRequires: gsl-devel BuildRequires: gsl-devel
%ifarch ppc ppc64 %ifarch ppc ppc64
@ -127,12 +133,8 @@ Group: Applications/Engineering
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
# The plug-in requires more than just the grass-libs. # The plug-in requires more than just the grass-libs.
# This questions the sense of the libs package is questionable # This questions the sense of the libs package.
Requires: grass
# 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
%description grass %description grass
GRASS plugin for QGIS required to interface with the GRASS system. 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 %changelog
* Mon Jun 06 2016 Volker Froehlich <volker27@gmx.at> - 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 <volker27@gmx.at> - 2.14.3-1 * Mon May 23 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-1
- New upstream release - New upstream release
@ -425,7 +432,8 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
- Rebuild for GRASS 7.0.3 - Rebuild for GRASS 7.0.3
* Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-3 * Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 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 <volker27@gmx.at> - 2.14.0-2 * Wed Mar 9 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-2
- Add patch for upstream issue #14402 (MSSQL) - Add patch for upstream issue #14402 (MSSQL)