Merging 2.14.3 update from master
This commit is contained in:
commit
dbb8499d6b
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -22,3 +22,4 @@ qgis_1.5.0.tar.gz
|
||||||
/qgis-2.12.3.tar.bz2
|
/qgis-2.12.3.tar.bz2
|
||||||
/qgis-2.14.0.tar.bz2
|
/qgis-2.14.0.tar.bz2
|
||||||
/qgis-2.14.1.tar.bz2
|
/qgis-2.14.1.tar.bz2
|
||||||
|
/qgis-2.14.3.tar.bz2
|
||||||
|
|
38
qgis.spec
38
qgis.spec
|
@ -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 6.4.4
|
||||||
|
|
||||||
#TODO: Run test suite (see debian/rules)
|
#TODO: Run test suite (see debian/rules)
|
||||||
|
|
||||||
Name: qgis
|
Name: qgis
|
||||||
Version: 2.14.1
|
Version: 2.14.3
|
||||||
Release: 2%{?dist}
|
Release: 3%{?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
|
||||||
|
@ -69,6 +75,7 @@ BuildRequires: PyQt4-devel
|
||||||
BuildRequires: PyQwt-devel
|
BuildRequires: PyQwt-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: python2-devel
|
BuildRequires: python2-devel
|
||||||
|
# qca2 is a virtual provides of qca. Put here to make things easier for EPEL!
|
||||||
BuildRequires: qca2-devel
|
BuildRequires: qca2-devel
|
||||||
BuildRequires: qextserialport-devel
|
BuildRequires: qextserialport-devel
|
||||||
BuildRequires: qscintilla-devel
|
BuildRequires: qscintilla-devel
|
||||||
|
@ -126,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 => 6.4.4
|
|
||||||
|
|
||||||
%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.
|
||||||
|
@ -405,8 +408,21 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Apr 11 2016 Dave Johansen <davejohansen@gmail.com> 2.14.1-2
|
* Tue Jun 07 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-3
|
||||||
- Fix grass dependency for EL
|
- Version bump to be newer than F24
|
||||||
|
|
||||||
|
* 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
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Apr 20 2016 Volker Froehlich <volker27@gmx.at> - 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 <volker27@gmx.at> - 2.14.1-1
|
* Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
Reference in New Issue
Block a user