From 5ca887026f38c1e5c53ab4251f22a1c075a0c08676db09a564d71f119ef058e5 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 24 Nov 2018 23:45:16 +0000
Subject: [PATCH] KDE Applications 18.12.0 Beta (last try; fix any other issue
 post acceptance)

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/ktouch?expand=0&rev=79
---
 ktouch-18.08.3.tar.xz  |  3 ---
 ktouch-18.11.80.tar.xz |  3 +++
 ktouch.changes         | 19 +++++++++++++++++++
 ktouch.spec            | 26 ++++++++++++--------------
 4 files changed, 34 insertions(+), 17 deletions(-)
 delete mode 100644 ktouch-18.08.3.tar.xz
 create mode 100644 ktouch-18.11.80.tar.xz

diff --git a/ktouch-18.08.3.tar.xz b/ktouch-18.08.3.tar.xz
deleted file mode 100644
index 21988d0..0000000
--- a/ktouch-18.08.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bf18f7b4f5644aa1d1f2248577d1aae2a96f091abefed9f8334124b60e73ce7
-size 5106384
diff --git a/ktouch-18.11.80.tar.xz b/ktouch-18.11.80.tar.xz
new file mode 100644
index 0000000..465ea34
--- /dev/null
+++ b/ktouch-18.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dc780ebfe8d0ae484b398d0684f8a31d82d65268c1d14e2a81a040d9b799997
+size 5121356
diff --git a/ktouch.changes b/ktouch.changes
index aacf55d..8342ab3 100644
--- a/ktouch.changes
+++ b/ktouch.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Nov 20 06:22:50 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Tue Nov 20 05:57:17 UTC 2018 - lbeltrame@kde.org
+
+- Update to 18.11.80
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/announce-applications-18.11.80.php
+- Changes since 18.08.3:
+  * Add donation url to appdata
+  * Add caption to the screenshot
+  * Fix minor EBN issue and typo
+  * Use QuickCompiler when possible
+  * Add New Italian Course and Update Keyboard Layout
+
 -------------------------------------------------------------------
 Thu Nov 08 20:43:46 UTC 2018 - lbeltrame@kde.org
 
diff --git a/ktouch.spec b/ktouch.spec
index 10de3e9..e080031 100644
--- a/ktouch.spec
+++ b/ktouch.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ktouch
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,22 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%bcond_without lang
-
-Name:           ktouch
-Version:        18.08.3
-Release:        0
 %define kf5_version 5.26.0
 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
+%bcond_without lang
+Name:           ktouch
+Version:        18.11.80
+Release:        0
 Summary:        Touch Typing Tutor
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Teaching/Other
-Url:            http://edu.kde.org
+URL:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  kcmutils-devel
 BuildRequires:  kconfig-devel
@@ -64,7 +63,6 @@ Obsoletes:      kde4-ktouch < 4.3.0
 %if %{with lang}
 Recommends:     %{name}-lang
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 A KDE program that helps you to learn and practice touch typing.
@@ -87,13 +85,13 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
   %kf5_makeinstall -C build
   %if %{with lang}
     %find_lang %{name} --with-man --all-name
-    %kf5_find_htmldocs
+    %{kf5_find_htmldocs}
   %endif
   %suse_update_desktop_file org.kde.ktouch       X-KDE-Edu-Teaching
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS COPYING* README.md
+%license COPYING*
+%doc AUTHORS README.md
 %dir %{_kf5_appstreamdir}
 %dir %{_kf5_configkcfgdir}
 %doc %lang(en) %{_kf5_htmldir}/en/ktouch/
@@ -107,7 +105,7 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
 %endif
 
 %changelog