From 276023272b1adb2b4b01a4390ca835789b6ec52b3035aea3d5115f21e705e8cb Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 24 Nov 2018 23:44:53 +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/klettres?expand=0&rev=81
---
 klettres-18.08.3.tar.xz  |  3 ---
 klettres-18.11.80.tar.xz |  3 +++
 klettres.changes         | 21 +++++++++++++++++++++
 klettres.spec            | 31 ++++++++++++++-----------------
 4 files changed, 38 insertions(+), 20 deletions(-)
 delete mode 100644 klettres-18.08.3.tar.xz
 create mode 100644 klettres-18.11.80.tar.xz

diff --git a/klettres-18.08.3.tar.xz b/klettres-18.08.3.tar.xz
deleted file mode 100644
index fefd6ca..0000000
--- a/klettres-18.08.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62afb830bda24851d9d3c896cd656e6a836c7bedd90b0f04124008ad562b3485
-size 21713040
diff --git a/klettres-18.11.80.tar.xz b/klettres-18.11.80.tar.xz
new file mode 100644
index 0000000..56928ac
--- /dev/null
+++ b/klettres-18.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ec44cc670cdb6cb521584fff8b80e7bdbc00ef6d0017fd1a811f2f4b223a56a
+size 21712152
diff --git a/klettres.changes b/klettres.changes
index 150c575..3338565 100644
--- a/klettres.changes
+++ b/klettres.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Nov 20 06:22:28 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Tue Nov 20 05:57:06 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
+  * Use nullptr instead of 0
+  * Port away from deprecated Phonon::MediaSource::MediaSource(const QString&)
+  * QLocale doesn't know the nativeLanguageName of tn so add it manually
+  * Autogenerate debug file + install categories file
+  * Fix compile with strict compile flags.
+
 -------------------------------------------------------------------
 Thu Nov 08 20:43:39 UTC 2018 - lbeltrame@kde.org
 
diff --git a/klettres.spec b/klettres.spec
index 6d3e039..e81eaf3 100644
--- a/klettres.spec
+++ b/klettres.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package klettres
 #
-# 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:           klettres
-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:           klettres
+Version:        18.11.80
+Release:        0
 Summary:        Alphabet Learning Game
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Amusements/Teaching/Language
-Url:            http://edu.kde.org
+URL:            http://edu.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kcompletion-devel
@@ -47,12 +46,9 @@ BuildRequires:  pkgconfig(Qt5Network)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Widgets)
+Recommends:     %{name}-lang
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
-%if %{with lang}
-Recommends:     %{name}-lang
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Helps to learn the alphabet and read some syllables.
@@ -75,13 +71,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.%{name}       Education Languages
 
 %files
-%defattr(-,root,root)
-%doc COPYING AUTHORS ChangeLog
+%license COPYING
+%doc AUTHORS ChangeLog
 %config %{_kf5_configdir}/klettres.knsrc
 %dir %{_kf5_appstreamdir}
 %dir %{_kf5_configkcfgdir}
@@ -93,10 +89,11 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %{_kf5_configkcfgdir}/klettres.kcfg
 %{_kf5_iconsdir}/hicolor/*/apps/klettres.*
 %{_kf5_kxmlguidir}/klettres/
+%{_kf5_debugdir}/klettres.categories
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
 %endif
 
 %changelog