diff --git a/.gitignore b/.gitignore index e65c829..31e0767 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ qgis_1.5.0.tar.gz /qgis-2.12.3.tar.bz2 /qgis-2.14.0.tar.bz2 /qgis-2.14.1.tar.bz2 +/qgis-2.14.3.tar.bz2 diff --git a/qgis.spec b/qgis.spec index 7c2a735..12296f3 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 6.4.4 + #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.14.1 -Release: 2%{?dist} +Version: 2.14.3 +Release: 3%{?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 @@ -69,6 +75,7 @@ BuildRequires: PyQt4-devel BuildRequires: PyQwt-devel %endif BuildRequires: python2-devel +# qca2 is a virtual provides of qca. Put here to make things easier for EPEL! BuildRequires: qca2-devel BuildRequires: qextserialport-devel BuildRequires: qscintilla-devel @@ -126,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 => 6.4.4 +# This questions the sense of the libs package. +Requires: grass %description grass GRASS plugin for QGIS required to interface with the GRASS system. @@ -405,8 +408,21 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog -* Mon Apr 11 2016 Dave Johansen 2.14.1-2 -- Fix grass dependency for EL +* Tue Jun 07 2016 Volker Froehlich - 2.14.3-3 +- Version bump to be newer than F24 + +* 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 + +* Wed Apr 20 2016 Volker Froehlich - 2.14.1-2 +- Change BR of qca to qca2 to make things easier in EPEL +- Rebuild for BZ #1327360 +- Make the requires on grass match an exact version again * Sun Mar 27 2016 Volker Froehlich - 2.14.1-1 - New upstream release diff --git a/sources b/sources index 4800bfd..ff1bd33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60e0708650303f28fdfe84b555c41c18 qgis-2.14.1.tar.bz2 +8598c7bbe47d3b88c0df5524589d2cb0 qgis-2.14.3.tar.bz2