From 5176dbdd41e3806107efa0ae9a2e07cbf46169985844aab5b44e1680eebae053 Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Sat, 24 Nov 2018 23:45:04 +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/kolourpaint?expand=0&rev=86
---
 kolourpaint-18.08.3.tar.xz  |  3 ---
 kolourpaint-18.11.80.tar.xz |  3 +++
 kolourpaint.changes         | 26 ++++++++++++++++++++++++++
 kolourpaint.spec            | 26 ++++++++++++--------------
 4 files changed, 41 insertions(+), 17 deletions(-)
 delete mode 100644 kolourpaint-18.08.3.tar.xz
 create mode 100644 kolourpaint-18.11.80.tar.xz

diff --git a/kolourpaint-18.08.3.tar.xz b/kolourpaint-18.08.3.tar.xz
deleted file mode 100644
index fa4ef76..0000000
--- a/kolourpaint-18.08.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:207d344db75e13f1d72050e329dba3d8a48227c22c93e916741f76ae742fb44b
-size 5548536
diff --git a/kolourpaint-18.11.80.tar.xz b/kolourpaint-18.11.80.tar.xz
new file mode 100644
index 0000000..c73833c
--- /dev/null
+++ b/kolourpaint-18.11.80.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:904fe84aab7dd1652ceca03811a3845fbd0cac665d838959da251a92872be7f2
+size 5547476
diff --git a/kolourpaint.changes b/kolourpaint.changes
index 193b1ed..ca0f137 100644
--- a/kolourpaint.changes
+++ b/kolourpaint.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Nov 20 06:22:37 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
+
+- Run spec-cleaner
+
+-------------------------------------------------------------------
+Tue Nov 20 05:57:10 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
+  * Fix minor EBN issues [includes] + [normalize]
+  * Fix minor EBN issues
+  * QImage::numColors -> colorCount
+  * include GenerateExportHeader
+  * Mark with kdelibs4support the includes that need removing...
+  * Add other frameworks we use besides kdelibs4support
+  * Remove unused knuminput include
+  * Remove unused kimageio include
+  * Remove unused kapplication include
+  * Remove kdeversion
+  * include KLocale -> KLocalizedString
+
 -------------------------------------------------------------------
 Thu Nov 08 20:43:41 UTC 2018 - lbeltrame@kde.org
 
diff --git a/kolourpaint.spec b/kolourpaint.spec
index ab6def2..b6443bf 100644
--- a/kolourpaint.spec
+++ b/kolourpaint.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kolourpaint
 #
-# 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,26 +12,25 @@
 # 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:           kolourpaint
-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:           kolourpaint
+Version:        18.11.80
+Release:        0
 # See bnc#717722 for license details
 Summary:        Paint Program
 # kolourpaint-17.04.1/imagelib/effects/blitz.h is GPL licensed by mistake in the tarball
 # but was relicensed to BSD in commit 36f297a9c9c9f5323273bdc57f5ee3a4e8e00743 (part of the next release)
 # GPL-2.0 is the license of the Bulgarian translation
-License:        BSD-2-Clause and LGPL-2.1+ and GFDL-1.2+ and GPL-2.0
+License:        BSD-2-Clause AND LGPL-2.1-or-later AND GFDL-1.2-or-later AND GPL-2.0-only
 Group:          Productivity/Graphics/Bitmap Editors
-Url:            http://www.kde.org
+URL:            http://www.kde.org
 Source0:        %{name}-%{version}.tar.xz
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
@@ -46,7 +45,6 @@ Obsoletes:      kolourpaint5 < %{version}
 %if %{with lang}
 Recommends:     %{name}-lang
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Paint program for KDE
@@ -66,7 +64,7 @@ Paint program for KDE
   %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.kolourpaint       RasterGraphics
   %fdupes -s %{buildroot}%{_datadir}
@@ -75,8 +73,8 @@ Paint program for KDE
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc COPYING README
+%license COPYING
+%doc README
 %dir %{_kf5_appstreamdir}
 %dir %{_kf5_htmldir}
 %dir %{_kf5_htmldir}/en
@@ -91,7 +89,7 @@ Paint program for KDE
 
 %if %{with lang}
 %files lang -f %{name}.lang
-%doc COPYING*
+%license COPYING*
 %endif
 
 %changelog