Merge branch 'master' into f24

.gitignore

@@ -21,3 +21,5 @@ qgis_1.5.0.tar.gz
 /qgis-2.12.2.tar.bz2
 /qgis-2.12.3.tar.bz2
 /qgis-2.14.0.tar.bz2
+/qgis-2.14.1.tar.bz2
+/qgis-2.14.3.tar.bz2

qgis.spec

@@ -35,9 +35,6 @@ Source4:        %{name}-server-README.fedora
 # Based on debian/qgis.xml but excluding already defined or proprietary types
 Source5:        %{name}-mime.xml
 
-# https://github.com/qgis/QGIS/commit/30449e577f0cd432bd8c60787743fba54c1e51b9.patch
-Patch0:         %{name}-2.14.0-mssql-attributes.patch
-
 # Some plug-ins need Pyspatialite (bundled)
 # The license is not totally clear, see:
 # http://code.google.com/p/pyspatialite/issues/detail?id=3
@@ -72,7 +69,8 @@ BuildRequires:  PyQt4-devel
 BuildRequires:  PyQwt-devel
 %endif
 BuildRequires:  python2-devel
-BuildRequires:  qca-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
 BuildRequires:  qscintilla-python-devel
@@ -134,7 +132,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 # 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
+Requires:       grass = 7.0.3
 
 %description grass
 GRASS plugin for QGIS required to interface with the GRASS system.
@@ -178,8 +176,6 @@ Please refer to %{name}-server-README.fedora for details!
 %prep
 %setup -q
 
-%patch0 -p1 -b .~mssql
-
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
 
@@ -214,7 +210,7 @@ gzip ChangeLog
       -D WITH_BINDINGS:BOOL=TRUE \
       -D MAPSERVER_SKIP_ECW=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
-      -D WITH_GRASS6:BOOL=TRUE \
+      -D WITH_GRASS7:BOOL=TRUE \
       -D GRASS_PREFIX=%{_libdir}/grass \
       -D WITH_MAPSERVER:BOOL=TRUE \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
@@ -397,15 +393,37 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_datadir}/%{name}/python/
 %{python_sitearch}/%{name}/
 %{python_sitearch}/PyQt4/uic/widget-plugins/
+%exclude %{python_sitearch}/%{name}/server/
+%exclude %{python_sitearch}/%{name}/_server.so
 
 %files server
 %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
 %{_libdir}/lib%{name}_server.so.*
 %{_libexecdir}/%{name}/
+%{python_sitearch}/%{name}/server/
+%{python_sitearch}/%{name}/_server.so
 
 
 %changelog
+* 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
+- New upstream release
+- Resolve the false sub-package dependency of python on server
+
+* Fri Mar 25 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-5
+- Depend exclusively against GRASS => 7.0.3
+
+* Thu Mar 17 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-4
+- Rebuild for GRASS 7.0.3
+
 * Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-3
 - Remove requires-filtering, masking a dependency for libgsl
 

sources

@@ -1 +1 @@
-e58294f6abd70951be3fcb3162ff6bc8  qgis-2.14.0.tar.bz2
+8598c7bbe47d3b88c0df5524589d2cb0  qgis-2.14.3.tar.bz2