From ac96034de2f753fd6f13b27e2d9a991888b34dd1fe1220e968b585956e5a8a70 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Thu, 1 Nov 2018 08:16:36 +0000
Subject: [PATCH] Accepting request 645707 from
 home:Guillaume_G:branches:Application:Geo

- Enable openCL
- Update to 3.4.0
- Remove qgis.desktop source as it is provided by qgis sources now

OBS-URL: https://build.opensuse.org/request/show/645707
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=239
---
 qgis-3.2.3.tar.bz2     |  3 ---
 qgis-3.2.3.tar.bz2.md5 |  1 -
 qgis-3.4.0.tar.bz2     |  3 +++
 qgis-3.4.0.tar.bz2.md5 |  1 +
 qgis.changes           | 11 +++++++++++
 qgis.desktop           | 10 ----------
 qgis.spec              | 19 ++++++++++++-------
 7 files changed, 27 insertions(+), 21 deletions(-)
 delete mode 100644 qgis-3.2.3.tar.bz2
 delete mode 100644 qgis-3.2.3.tar.bz2.md5
 create mode 100644 qgis-3.4.0.tar.bz2
 create mode 100644 qgis-3.4.0.tar.bz2.md5
 delete mode 100644 qgis.desktop

diff --git a/qgis-3.2.3.tar.bz2 b/qgis-3.2.3.tar.bz2
deleted file mode 100644
index 5b35bcf..0000000
--- a/qgis-3.2.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c91383185fb20ccdc7c009955aa1855df1d2722d4359bf7f241727c5680ef720
-size 71991789
diff --git a/qgis-3.2.3.tar.bz2.md5 b/qgis-3.2.3.tar.bz2.md5
deleted file mode 100644
index ffe5f31..0000000
--- a/qgis-3.2.3.tar.bz2.md5
+++ /dev/null
@@ -1 +0,0 @@
-8168983756e7388288a91026a2dfa135  qgis-3.2.3.tar.bz2
diff --git a/qgis-3.4.0.tar.bz2 b/qgis-3.4.0.tar.bz2
new file mode 100644
index 0000000..cface7e
--- /dev/null
+++ b/qgis-3.4.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b63a6ebbd4e4afb2820887b18b0aa41e3c7862f7fbdc8a121d6fcd75f0321e98
+size 72309170
diff --git a/qgis-3.4.0.tar.bz2.md5 b/qgis-3.4.0.tar.bz2.md5
new file mode 100644
index 0000000..704cf0d
--- /dev/null
+++ b/qgis-3.4.0.tar.bz2.md5
@@ -0,0 +1 @@
+5098e07d8426fad256790826ed31b192  qgis-3.4.0.tar.bz2
diff --git a/qgis.changes b/qgis.changes
index 956c9ea..44cc10a 100644
--- a/qgis.changes
+++ b/qgis.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Oct 30 13:47:09 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Enable openCL
+
+-------------------------------------------------------------------
+Tue Oct 30 13:38:20 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Update to 3.4.0
+- Remove qgis.desktop source as it is provided by qgis sources now
+
 -------------------------------------------------------------------
 Fri Oct 19 14:46:55 UTC 2018 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 
diff --git a/qgis.desktop b/qgis.desktop
deleted file mode 100644
index 467a351..0000000
--- a/qgis.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=QGIS 3.2.3 (Bonn)
-GenericName=Geographic Information System
-Comment=
-Exec=qgis
-Icon=qgis.png
-Terminal=false
-Type=Application
-Categories=Qt;Education;Geoscience;Geography;Science;
diff --git a/qgis.spec b/qgis.spec
index 1b72f28..a1b6647 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -17,17 +17,16 @@
 
 
 Name:           qgis
-Version:        3.2.3
+Version:        3.4.0
 Release:        0
 Summary:        QGIS is a Geographic Information System (GIS)
 License:        GPL-2.0-only
 Group:          Productivity/Graphics/Visualization/Other
 URL:            https://qgis.org/
 Source:         https://qgis.org/downloads/%{name}-%{version}.tar.bz2
-Source1:        %{name}.desktop
+Source1:        https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5
 Source2:        %{name}.rpmlintrc
 Source3:        qgis_sample_data.zip
-Source4:        https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5
 # Headers in Qt5.11 were cleaned up to no longer include unneeded other headers.
 Patch0:         fix_grass_qt511.patch
 BuildRequires:  -post-build-checks
@@ -43,6 +42,8 @@ BuildRequires:  grass-devel >= 7.2
 BuildRequires:  libqscintilla_qt5-devel
 BuildRequires:  libspatialindex-devel
 BuildRequires:  llvm-clang
+BuildRequires:  ocl-icd-devel
+BuildRequires:  opencl-cpp-headers
 BuildRequires:  otb-devel
 BuildRequires:  pkgconfig
 BuildRequires:  poppler-tools
@@ -209,6 +210,7 @@ export PATH=$PATH:$QTDIR/bin
   -DQWT_INCLUDE_DIR=%{_includedir}/qwt6 \
   -DQCA_INCLUDE_DIR=%{_includedir}/qt5/Qca-qt5/QtCrypto \
   -DCMAKE_SKIP_RPATH=OFF \
+  -DOpenCL_INCLUDE_DIR=%{_includedir} \
   -Wno-dev
 
 export QTDIR=%{_prefix}
@@ -218,13 +220,12 @@ export PATH=$PATH:$QTDIR/bin
 %install
 %cmake_install
 
-mkdir -p %{buildroot}%{_datadir}/applications
-cp %{SOURCE1} %{buildroot}%{_datadir}/applications
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 ln -s ../qgis/images/icons/qgis-icon-512x512.png %{buildroot}/%{_datadir}/pixmaps/qgis.png
 
-# Do not update .desktop files
-%suse_update_desktop_file -n %{name}
+# Rename .desktop file
+mv %{buildroot}%{_datadir}/applications/org.qgis.qgis.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 
 # Install sample data
 pushd %{buildroot}%{_datadir}/qgis
@@ -243,6 +244,10 @@ popd
 %{_datadir}/qgis/*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/qgis.png
+%{_datadir}/icons/hicolor/*/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.svg
+%{_datadir}/icons/hicolor/*/mimetypes/*.png
+%{_datadir}/icons/hicolor/*/mimetypes/*.svg
 %{_datadir}/metainfo/org.qgis.qgis.appdata.xml
 %dir %{_libdir}/qgis/
 %{_libdir}/qgis/*