Merge branch 'daniviga-2.18.9' of dani/copr-dani-qgis into daniviga-2.18

See:
https://hub.qgis.org/issues/14651

.gitignore

@@ -1,31 +1,10 @@
-qgis_1.5.0.tar.gz
-/qgis_1.6.0.tar.gz
-/qgis-1.7.0.tar.bz2
-/qgis-1.7.1.tar.bz2
-/qgis-1.7.2.tar.bz2
-/qgis-1.7.3.tar.bz2
-/qgis-1.7.4.tar.bz2
-/qgis-1.8.0.tar.bz2
-/qgis-2.0.0.tar.bz2
-/qgis-2.0.1.tar.bz2
-/qgis-2.2.0.tar.bz2
-/qgis-2.4.0.tar.bz2
-/qgis-2.6.0.tar.bz2
-/qgis-2.6.1.tar.bz2
-/qgis-2.8.1.tar.bz2
-/qgis-2.8.2.tar.bz2
-/qgis-2.10.0.tar.bz2
-/qgis-2.10.1.tar.bz2
-/qgis-2.12.0.tar.bz2
-/qgis-2.12.1.tar.bz2
-/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-2.16.2.tar.bz2
-/qgis-2.16.3.tar.bz2
 /qgis-2.18.0.tar.bz2
 /qgis-2.18.1.tar.bz2
 /qgis-2.18.2.tar.bz2
+/qgis-2.18.3.tar.bz2
 /qgis-2.18.4.tar.bz2
+/qgis-2.18.5.tar.bz2
+/qgis-2.18.6.tar.bz2
+/qgis-2.18.7.tar.bz2
+/qgis-2.18.8.tar.bz2
+/qgis-2.18.9.tar.bz2

qgis.spec

@@ -11,12 +11,15 @@
 %endif
 %endif
 
+%if 0%{?fedora} >= 24
+%global configure_with_grass7 -D WITH_GRASS7:BOOL=TRUE
+%endif
 
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        2.18.4
-Release:        2%{?dist}
+Version:        2.18.9
+Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 Group:          Applications/Engineering
 
@@ -76,7 +79,7 @@ BuildRequires:  postgresql-devel
 BuildRequires:  proj-devel
 BuildRequires:  PyQt4-devel
 # PyQwt doesn't support qwt6, so just turn it off for now on RHEL
-%if 0%{?fedora} < 26
+%if 0%{?fedora}
 BuildRequires:  PyQwt-devel
 %endif
 BuildRequires:  python2-devel
@@ -190,7 +193,9 @@ Please refer to %{name}-server-README.fedora for details!
 %prep
 %setup -q
 %patch0 -p1 -b .lib64
+%if 0%{?fedora} >= 26
 %patch1 -p1 -b .sip
+%endif
 
 # Remove executable permissions from source code files
 find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -225,7 +230,7 @@ gzip ChangeLog
       -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
       -D WITH_GRASS:BOOL=TRUE \
-      -D WITH_GRASS7:BOOL=TRUE \
+      %{configure_with_grass7} \
       -D GRASS_PREFIX=%{_libdir}/grass \
       -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
@@ -413,23 +418,35 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon May 29 2017 Daniele Viganò <daniele@vigano.me> - 2.18.9-1
+- New upstream release
+
+* Mon May 22 2017 Daniele Viganò <daniele@vigano.me> - 2.18.8-1
+- New upstream release
+
+* Wed Apr 26 2017 Daniele Viganò <daniele@vigano.me> - 2.18.7-1
+- New upstream release
+
+* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-2
+- Fix F26 builds
+
+* Sun Apr 09 2017 Daniele Viganò <daniele@vigano.me> - 2.18.6-1
+- New upstream release
+
+* Fri Apr 07 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-2
+- Build for F26
+
+* Mon Mar 27 2017 Daniele Viganò <daniele@vigano.me> - 2.18.5-1
+- New upstream release
+
 * Wed Mar 01 2017 Sandro Mani <manisandro@gmail.com> - 2.18.4-2
 - Add patch to fix FTBFS
 
-* Fri Feb 24 2017 Volker Froehlich <volker27@gmx.at> - 2.18.4-1
+* Wed Mar 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.4-1
 - New upstream release
 
-* Mon Feb 20 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.18.2-5
-- rebuild (qscintilla)
-
-* Tue Feb 14 2017 Volker Froehlich <volker27@gmx.at> - 2.18.2-4
-- Apply build patch for SIP 4.19 (#16071)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sun Jan 01 2017 Rex Dieter <rdieter@math.unl.edu> - 2.18.2-2
-- rebuild (sip), disable PyQwt support (f26+, for now)
+* Wed Feb 01 2017 Daniele Viganò <daniele@vigano.me> - 2.18.3-1
+- New upstream release
 
 * Fri Dec 16 2016 Volker Froehlich <volker27@gmx.at> - 2.18.2-1
 - New upstream release

qgis_sip-ftbfs.patch

@@ -181,22 +181,6 @@ index f07d3ab1db..948821e91e 100644
 +    return sipGetState(sipTransferObj);
 +%End
 +};
-diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h
-index c9276f7caf..841e4b6ee1 100644
---- a/src/gui/qgsfiledownloader.h
-+++ b/src/gui/qgsfiledownloader.h
-@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject
-     void onSslErrors( QNetworkReply *reply, const QList<QSslError> &errors );
- #endif
- 
--  private:
-+  protected:
-     ~QgsFileDownloader();
-+
-+  private:
-     /**
-      * Abort current request and show an error if the instance has GUI
-      * notifications enabled.
 -- 
 2.12.0
 

sources

@@ -1 +1 @@
-SHA512 (qgis-2.18.4.tar.bz2) = 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7
+SHA512 (qgis-2.18.9.tar.bz2) = 2495d9bc4f22f22882beb322d01465dd456a6db8a59a7e8e8056555b6ab4c895e9fc70d423f36a856d3a3b890bb3fbab607f7fd34736a8d2bc69f29bf1d91ca4