diff --git a/.gitignore b/.gitignore
index 68b7c45..a161c26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ qgis_1.5.0.tar.gz
/qgis-2.12.1.tar.bz2
/qgis-2.12.2.tar.bz2
/qgis-2.12.3.tar.bz2
+/qgis-2.14.0.tar.bz2
diff --git a/qgis-mime.xml b/qgis-mime.xml
index 32a4317..bf8fec6 100644
--- a/qgis-mime.xml
+++ b/qgis-mime.xml
@@ -6,6 +6,7 @@
QGIS-Projekt
+
@@ -18,6 +19,7 @@
QGIS layer settings
QGIS Layer Einstellungen
+
diff --git a/qgis.spec b/qgis.spec
index e373fae..ed3f5af 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -1,3 +1,5 @@
+#TODO: Fix error message with processing plug-in in regards to pyspatialite
+
# Shared lib calls exit
# https://hub.qgis.org/issues/2854
@@ -12,8 +14,8 @@
#TODO: Run test suite (see debian/rules)
Name: qgis
-Version: 2.12.3
-Release: 2%{?dist}
+Version: 2.14.0
+Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@@ -33,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/pull/2401
-Patch0: qgis-2.12.0-arm.patch
-
# Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see:
# http://code.google.com/p/pyspatialite/issues/detail?id=3
@@ -152,6 +151,7 @@ Requires: python-OWSLib
Requires: python-psycopg2
Requires: python-pygments
Requires: python-six
+Requires: PyYAML
Requires: qscintilla-python
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
@@ -176,7 +176,6 @@ Please refer to %{name}-server-README.fedora for details!
%prep
%setup -q
-%patch0 -p1
# Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@@ -211,7 +210,8 @@ gzip ChangeLog
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \
-D MAPSERVER_SKIP_ECW=TRUE \
- -D WITH_GRASS7:BOOL=FALSE \
+ -D WITH_GRASS:BOOL=TRUE \
+ -D WITH_GRASS6:BOOL=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \
-D WITH_MAPSERVER:BOOL=TRUE \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
@@ -227,6 +227,7 @@ gzip ChangeLog
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_SIX:BOOL=FALSE \
+ -D WITH_INTERNAL_YAML:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \
-D WITH_SERVER:BOOL=TRUE \
-D WITH_TOUCH:BOOL=TRUE \
@@ -240,7 +241,6 @@ make %{?_smp_mflags}
%install
-#TODO: Icon
# Necessary for the test suite
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
make install DESTDIR=%{buildroot}
@@ -264,25 +264,27 @@ install -pm0644 %{SOURCE5} \
%{buildroot}%{_datadir}/mime/packages/%{name}.xml
# Install application and MIME icons
+for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
+ install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
+ install -pm0644 debian/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png
+ install -pm0644 debian/qbrowser-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qbrowser.png
+done
+
+for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do
+ install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes
+ install -pm0644 debian/qgis-mime-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes/qgis-mime.png
+done
+
install -pd %{buildroot}%{_datadir}/pixmaps
-install -pd %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
-install -pm0644 \
- %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \
- %{buildroot}%{_datadir}/pixmaps/%{name}.png
-install -pm0644 \
- images/icons/%{name}-icon-16x16.png \
- %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-install -pm0644 \
- images/icons/%{name}_icon.svg \
- %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-install -pm0644 \
- %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
- %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
-install -pm0644 \
- %{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
- %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png
+
+install -pm0644 images/icons/%{name}-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -pm0644 images/icons/qbrowser-icon.png %{buildroot}%{_datadir}/pixmaps/qbrowser.png
+install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png
+install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/qbrowser.svg
+install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
+install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/pixmaps/qbrowser.svg
# Install basic QGIS Mapserver configuration for Apache
install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
@@ -337,11 +339,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%postun python -p /sbin/ldconfig
%files -f %{name}.lang
-%doc BUGS CODING NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
+%doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
# QGIS shows the following files in the GUI, including the license text
%doc %{_datadir}/%{name}/doc/
%dir %{_datadir}/%{name}/i18n/
%lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
+%lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm
%if 0%{?rhel}
%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
%endif
@@ -350,7 +353,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_libdir}/lib%{name}_core.so.*
%{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}_networkanalysis.so.*
-%{_libdir}/lib%{name}_server.so.*
%{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name}
@@ -359,11 +361,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_mandir}/man1/qbrowser.1*
%dir %{_datadir}/%{name}/
%{_datadir}/mime/packages/qgis.xml
-%{_datadir}/pixmaps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png
-%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
+%{_datadir}/pixmaps/
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images/
@@ -398,10 +398,19 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%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}/
%changelog
+* Sat Feb 27 2016 Volker Froehlich - 2.14.0-1
+- New upstream release
+- Add PyYAML as BR and disable the use of the bundled version
+- Be more explicit about the supported version of grass
+- Install proper icons (BZ #1166977)
+- Break the dependency of the base package on the python sub-package
+- Add a new locale not found by find_lang
+
* Thu Feb 04 2016 Fedora Release Engineering - 2.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
diff --git a/sources b/sources
index 9f9c531..85206f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f57ad5f04451d30032dbdd1836e0cb22 qgis-2.12.3.tar.bz2
+e58294f6abd70951be3fcb3162ff6bc8 qgis-2.14.0.tar.bz2