From 5176dbdd41e3806107efa0ae9a2e07cbf46169985844aab5b44e1680eebae053 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sat, 24 Nov 2018 23:45:04 +0000 Subject: [PATCH 1/4] 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 + +- 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 From 1438c7103056fab66ee7bd30e070b1bc1a002e6a80d2080cfb0553d191c4db03 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 4 Dec 2018 16:22:50 +0000 Subject: [PATCH 2/4] KDE Applications 18.12.0 RC (knights is already in K:A) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolourpaint?expand=0&rev=87 --- kolourpaint-18.11.80.tar.xz | 3 --- kolourpaint-18.11.90.tar.xz | 3 +++ kolourpaint.changes | 10 ++++++++++ kolourpaint.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kolourpaint-18.11.80.tar.xz create mode 100644 kolourpaint-18.11.90.tar.xz diff --git a/kolourpaint-18.11.80.tar.xz b/kolourpaint-18.11.80.tar.xz deleted file mode 100644 index c73833c..0000000 --- a/kolourpaint-18.11.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:904fe84aab7dd1652ceca03811a3845fbd0cac665d838959da251a92872be7f2 -size 5547476 diff --git a/kolourpaint-18.11.90.tar.xz b/kolourpaint-18.11.90.tar.xz new file mode 100644 index 0000000..ee13e05 --- /dev/null +++ b/kolourpaint-18.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:433250c7c9bb2621ce78b854578544c64f03dc24a38eebf2de172d55526ba7db +size 5547652 diff --git a/kolourpaint.changes b/kolourpaint.changes index ca0f137..875b1de 100644 --- a/kolourpaint.changes +++ b/kolourpaint.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 03 20:56:06 UTC 2018 - lbeltrame@kde.org + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + ------------------------------------------------------------------- Tue Nov 20 06:22:37 UTC 2018 - Luca Beltrame diff --git a/kolourpaint.spec b/kolourpaint.spec index b6443bf..185e545 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kolourpaint -Version: 18.11.80 +Version: 18.11.90 Release: 0 # See bnc#717722 for license details Summary: Paint Program From 5ba25767e3f20b4743320ae389f0e04e6e2b28c1fbdf197572789b71cd446b9a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 16:51:05 +0000 Subject: [PATCH 3/4] KDE Applications 18.12.0 (not yet built) OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolourpaint?expand=0&rev=88 --- kolourpaint-18.11.90.tar.xz | 3 --- kolourpaint-18.12.0.tar.xz | 3 +++ kolourpaint.changes | 10 ++++++++++ kolourpaint.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 kolourpaint-18.11.90.tar.xz create mode 100644 kolourpaint-18.12.0.tar.xz diff --git a/kolourpaint-18.11.90.tar.xz b/kolourpaint-18.11.90.tar.xz deleted file mode 100644 index ee13e05..0000000 --- a/kolourpaint-18.11.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:433250c7c9bb2621ce78b854578544c64f03dc24a38eebf2de172d55526ba7db -size 5547652 diff --git a/kolourpaint-18.12.0.tar.xz b/kolourpaint-18.12.0.tar.xz new file mode 100644 index 0000000..8dd5552 --- /dev/null +++ b/kolourpaint-18.12.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec71422232340c38a331480cd2f5620d453f46ede7db1ac34413c2ccda0212d4 +size 5547648 diff --git a/kolourpaint.changes b/kolourpaint.changes index 875b1de..c427a4f 100644 --- a/kolourpaint.changes +++ b/kolourpaint.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 14 06:09:14 UTC 2018 - lbeltrame@kde.org + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + ------------------------------------------------------------------- Mon Dec 03 20:56:06 UTC 2018 - lbeltrame@kde.org diff --git a/kolourpaint.spec b/kolourpaint.spec index 185e545..8be8ab6 100644 --- a/kolourpaint.spec +++ b/kolourpaint.spec @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kolourpaint -Version: 18.11.90 +Version: 18.12.0 Release: 0 # See bnc#717722 for license details Summary: Paint Program From a0aeb2657415cd0ca119902866e1297f46a51aeb2b33077f8653d38d44400030 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 14 Dec 2018 22:28:00 +0000 Subject: [PATCH 4/4] Fix wrong beta and rc release announcement URLs OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kolourpaint?expand=0&rev=89 --- kolourpaint.changes | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kolourpaint.changes b/kolourpaint.changes index c427a4f..e310d08 100644 --- a/kolourpaint.changes +++ b/kolourpaint.changes @@ -29,7 +29,7 @@ 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 + * https://www.kde.org/announcements/announce-applications-18.12-beta.php - Changes since 18.08.3: * Add donation url to appdata * Fix minor EBN issues [includes] + [normalize] @@ -90,7 +90,7 @@ Thu Jul 26 13:00:50 UTC 2018 - lbeltrame@kde.org - Update to 18.07.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php - Changes since 18.04.3: * There's only http for kolourpaint.org * Use QT_USE_QSTRINGBUILDER instead of outdated QT definitions @@ -144,7 +144,7 @@ Fri Apr 06 07:09:46 CEST 2018 - lbeltrame@kde.org - Update to 18.03.90 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php - Changes since 17.12.3: * Modernize: Use nullptr where possible * Use override instead of Q_DECL_OVERRIDE @@ -257,7 +257,7 @@ Sat Aug 5 18:18:23 UTC 2017 - christophe@krop.fr - Update to KDE Applications 17.07.90 * KDE Applications 17.07.90 - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php ------------------------------------------------------------------- @@ -322,7 +322,7 @@ Sat Mar 25 23:10:36 CET 2017 - lbeltrame@kde.org - Update to 17.03.80 * New feature release * For more details please see: - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php - Changes since 16.12.3: * Kolourpaint by KDE (community) * Add setting for anti-aliased drawing; lots of code cleanup @@ -423,7 +423,7 @@ Mon Aug 8 15:17:09 UTC 2016 - tittiatcoke@gmail.com - Update to KDE Applications 16.07.90 * KDE Applications 16.07.90 (16.08-RC) - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php ------------------------------------------------------------------- @@ -539,7 +539,7 @@ Fri Aug 7 06:57:21 UTC 2015 - tittiatcoke@gmail.com - Update to KDE Applications 15.07.90 * KDE Applications 15.08.0 RC1 - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php -------------------------------------------------------------------