Merging 2.14.3 update from master

Fix grass dependency for EL
Fixing qca BuildRequires for EL 7
2016-06-22 21:26:45 -06:00 · 2016-04-11 21:46:29 -07:00 · 2016-04-08 23:22:32 -07:00 · 2016-04-08 23:21:07 -07:00 · 2015-12-03 19:12:38 -07:00 · 2015-08-07 20:22:16 -07:00
1 changed files with 1 additions and 1 deletions
--- a/qgis.spec
+++ b/qgis.spec
@ -15,7 +15,7 @@
 # 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
+%global grass_version 6.4.4

 #TODO: Run test suite (see debian/rules)
Author	SHA1	Message	Date
Dave Johansen	dbb8499d6b	Merging 2.14.3 update from master	2016-06-22 21:26:45 -06:00
Dave Johansen	cf6f78648e	Fix grass dependency for EL	2016-04-11 21:46:29 -07:00
Dave Johansen	b954fbbbd8	Fixing qca BuildRequires for EL 7	2016-04-08 23:22:32 -07:00
Dave Johansen	43714831db	Merging 2.14.1 from master	2016-04-08 23:21:07 -07:00
Dave Johansen	adc366a958	Update to 2.8.4	2015-12-03 19:12:38 -07:00
Dave Johansen	b6ce3a6a14	Updating to 2.8.3	2015-08-07 20:22:16 -07:00
Dave Johansen	db1af8c951	Putting back in the BuildRequires for PyQwt-devel but just conditionally removing it on RHEL for now	2015-06-09 20:43:33 -07:00
Dave Johansen	29b099fc66	Merge branch 'master' into epel7 Updating to 2.8	2015-06-09 20:35:50 -07:00
Dave Johansen	3a18fe2d2b	Merge branch 'master' into epel7	2015-01-02 13:57:03 -07:00
Dave Johansen	aa0543a0ef	PyQwt isn't available for Qwt 6.1.1 so don't use it for the time being	2015-01-02 10:26:57 -07:00