From 82084dc553fcf2bf6e60fd31a2a6713da12e793a242ec61430279925c9353d23 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 3 Jun 2018 17:47:14 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Extra/kst?expand=0&rev=12

---
 Fix-build-with-Qt-511.patch | 21 ++++++++++++++++++++
 kst.changes                 |  6 ++++++
 kst.spec                    | 38 ++++++++++++++++++-------------------
 3 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 Fix-build-with-Qt-511.patch

diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch
new file mode 100644
index 0000000..b25e6d6
--- /dev/null
+++ b/Fix-build-with-Qt-511.patch
@@ -0,0 +1,21 @@
+commit 7e980b03f3165417cceb9c5434e8123ffb1a44eb
+Author: Christophe Giboudeaux <christophe@krop.fr>
+Date:   Sun Jun 3 19:43:34 2018 +0200
+
+    Fix build with Qt 5.11
+    
+    qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead.
+
+diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake
+index 4ff9c151..bc3d8a6c 100644
+--- a/cmake/modules/KstMacros.cmake
++++ b/cmake/modules/KstMacros.cmake
+@@ -240,7 +240,7 @@ endmacro()
+ macro(kst_link)
+ 	target_link_libraries(${kst_name} ${ARGV})
+ 	if(kst_qt5)
+-		qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport)
++		target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+ 	else()
+ 		target_link_libraries(${kst_name}
+ 		${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY})
diff --git a/kst.changes b/kst.changes
index ee74f99..77f172d 100644
--- a/kst.changes
+++ b/kst.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jun  3 17:44:42 UTC 2018 - christophe@krop.fr
+
+- Add Fix-build-with-Qt-511.patch.
+- Run spec-cleaner
+
 -------------------------------------------------------------------
 Thu Feb 22 08:29:11 UTC 2018 - aloisio@gmx.com
 
diff --git a/kst.spec b/kst.spec
index b1418ee..ed5d223 100644
--- a/kst.spec
+++ b/kst.spec
@@ -21,13 +21,14 @@ Name:           kst
 Version:        2.0.8
 Release:        0
 Summary:        Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Graphics/Visualization/Graph
-Url:            http://kst-plot.kde.org/
+URL:            http://kst-plot.kde.org/
 Source:         Kst-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM gsl2-support.patch -- fixes build with GSL-2.0
-Patch:          gsl2-support.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch0:         gsl2-support.patch
+# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fixes build with Qt 5.11
+Patch1:         Fix-build-with-Qt-511.patch
 BuildRequires:  Mesa-devel
 BuildRequires:  cmake
 BuildRequires:  fdupes
@@ -89,11 +90,10 @@ Development libraries and headers needed to build software
 making use of %{name}
 
 %prep
-%setup -q -n=Kst-2.0.8
-%patch -p1
+%autosetup -p1 -q -n=Kst-2.0.8
 
 %build
-EXTRA_FLAGS="-Dkst_install_prefix=/usr \
+EXTRA_FLAGS="-Dkst_install_prefix=%{_prefix} \
              -Dkst_rpath=0 \
              -Dkst_install_libdir=%{_lib} \
              -Dkst_release=1 \
@@ -116,28 +116,26 @@ make %{?_smp_mflags}
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root)
-%{_datadir}/applications/%{name}2.desktop
-%{_bindir}/%{name}2
-%{_datadir}/applnk/
-%{_datadir}/mimelink/
+%license COPYING*
+%doc AUTHORS NEWS README
 %dir %{_datadir}/icons/hicolor
 %dir %{_datadir}/icons/hicolor/*
 %dir %{_datadir}/icons/hicolor/*/apps
-%{_datadir}/icons/hicolor/*/apps/*%{name}.*
-%{_libdir}/lib%{name}*.so.*
-%{_libdir}/%{name}2/
-%{_mandir}/man1/%{name}2.1.gz
 %dir %{_datadir}/kst
 %dir %{_datadir}/kst/locale
+%{_bindir}/%{name}2
+%{_datadir}/applications/%{name}2.desktop
+%{_datadir}/applnk/
+%{_datadir}/icons/hicolor/*/apps/*%{name}.*
 %{_datadir}/kst/locale/kst_common_*.qm
+%{_datadir}/mimelink/
+%{_libdir}/%{name}2/
+%{_libdir}/lib%{name}*.so.*
+%{_mandir}/man1/%{name}2.1%{?ext_man}
 
 %files devel
-%defattr(-,root,root)
+%license COPYING*
 %{_libdir}/*.so
 %{_libdir}/lib%{name}2app.a