From 31c20ff8828ecefac486a1716db99fe0cce94ecaf42401151ca3162e6d6f6c7b Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Mon, 19 Apr 2021 13:31:15 +0000
Subject: [PATCH] 21.04 release

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/picmi?expand=0&rev=139
---
 picmi-21.03.90.tar.xz     |  3 ---
 picmi-21.03.90.tar.xz.sig | 16 ----------------
 picmi-21.04.0.tar.xz      |  3 +++
 picmi-21.04.0.tar.xz.sig  | 16 ++++++++++++++++
 picmi.changes             |  9 +++++++++
 picmi.spec                | 24 +++++++++++-------------
 6 files changed, 39 insertions(+), 32 deletions(-)
 delete mode 100644 picmi-21.03.90.tar.xz
 delete mode 100644 picmi-21.03.90.tar.xz.sig
 create mode 100644 picmi-21.04.0.tar.xz
 create mode 100644 picmi-21.04.0.tar.xz.sig

diff --git a/picmi-21.03.90.tar.xz b/picmi-21.03.90.tar.xz
deleted file mode 100644
index 447e282..0000000
--- a/picmi-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:896e81c64bb19feecde54cf6f9e02f222050bfec70708c71ff78b0e58ec04ae9
-size 1369120
diff --git a/picmi-21.03.90.tar.xz.sig b/picmi-21.03.90.tar.xz.sig
deleted file mode 100644
index 36691ed..0000000
--- a/picmi-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsAACgkQu0YzUNbv
-Me/KSw/+OwkcZq5rISJskZiblfQhrXCB0+Gj79VeMmOAJOrXQI+bF5UVbApxbP89
-/I/08aH9bokbPuyvvXuA0LpehJz+R1Fu2cM6S7/zMVLnTp/k5ZfkiHTqoxDaYKoU
-bF530gYF5IH1jjaFrciZCcPv4PbUVX2G1xMWxBLH7FqWKxKjvZi/93LqE6YjNZ3n
-/xy37+sNGBUr2y3XmM9GWnKaJE/zWPi56QszcKcEfPEfA5cLsvmAC2OPkbQzx3TQ
-LSzpOPbAzTWIfxJ7W0yvlV+QUcofj4LvaobbUQ6BDyViby7oqpcl3AsFV/hPBbXn
-leesVbnccPRgQu+Kgkkbtic6ICiKEpmep46XsPpwGlz1BYmh8m2Cw1k03bJWS/24
-K7JVMsTXHmBOf0apPssyk9v3wrb6ZSuG+c5YmerxZIzS+ffLBaG5tPqwa+qMKS/i
-HNG05UwU0VixdV6f6xau5XWvWY/wHMLiHyB0Q0nnqq2u55t/ONuRb4cdYJA5MmDM
-Ka4P2oFuQ2ETkFRUZA61t/gNO7uASD1XtihPfZfJ2uw6eYvDuAIVa1xNLwOCBHO9
-4ja5kaKH26DLQ3rUybJBJR5X55hi5xlB6UGxyj2yeXiUGWldfuC2Q81SQFTRH5Mq
-QE+6dA8nA0wQ7gdq1XJDO9UFWC8dM9Fo8WDO/huPfCe6W/FWLdY=
-=gH4o
------END PGP SIGNATURE-----
diff --git a/picmi-21.04.0.tar.xz b/picmi-21.04.0.tar.xz
new file mode 100644
index 0000000..2b1f383
--- /dev/null
+++ b/picmi-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:239bbdbecdd8441f4179d5e85a9b0f3e555a13cf4f44b213719b2e01d8e79adf
+size 1369132
diff --git a/picmi-21.04.0.tar.xz.sig b/picmi-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..b9d3093
--- /dev/null
+++ b/picmi-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwoACgkQu0YzUNbv
+Me82jQ//W3hU1cK2DDD3JMUNTqcRrMSt0e4yv5ThCosttT+1zYJdOInb6sN3mhdW
+7dGKq+w7/pMpYImNMf5iXBwX3EbnkExfVcHN7qhPJ48JN3AJAE4HykntPsCg3guG
+ChyPbN28qsfVuh6E8nYkZfVkPufZSGpJzHVZi/KHU1TxtlOLbrUTmR7SqaCy5E4c
+O7tK4YvqJ1H6Xgj1jaiKMQJq552HgkSwX3mkEakTPF1NyTqonHOh+8Qa4kNcOLEy
++R53lL6P74ub1ZTVBla7FPErSfXtoBtXaGo2FI8R8RKs7zf9wthXBcCOYhZrdDN1
+Ed9ZF8aZ5OhuMdeA7UMS8RWOEgThlfgkOW22sZPBeRq4umAZSVKqRFUA6yNiWukI
+oIiio+sKE1B8+0u1p+1sm6AAWx0JYS1ZDmP+PADxkZiRMfn4wdkyL0u9wAA8MeI3
+CBx25RiTPuvrutHF0DRFtrZc81mUlMUXX/GqOoipJ+hPunOrLL5J+wDz+vACY9q0
+UEgx17uyPjmEhRFwwYo9DuPX8QHnSQd7fkJBNn03dDt77p5XkXpyMFYvsAB4Eh1u
+9hqr0hYBoAu4TrO/7pX/F70vitB/p5Ye4hDhmwf1D4LijZtf6UfHM7ugo1O3UDtk
+bJhtjq129RpGCweGFcDlkd1kqiUEb1oqqv6I3XayNKpMT0q2tMY=
+=DuGT
+-----END PGP SIGNATURE-----
diff --git a/picmi.changes b/picmi.changes
index aec056b..f5b6323 100644
--- a/picmi.changes
+++ b/picmi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:21 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/releases/21.04.0
+- No code change since 21.03.90
+
 -------------------------------------------------------------------
 Fri Apr  9 17:41:46 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/picmi.spec b/picmi.spec
index 8e13dbb..c135baa 100644
--- a/picmi.spec
+++ b/picmi.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           picmi
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Nonogram Logic game
 License:        GPL-2.0-or-later
 Group:          Amusements/Games/Logic
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/picmi
+Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
 BuildRequires:  extra-cmake-modules
 BuildRequires:  update-desktop-files
 BuildRequires:  cmake(KF5CoreAddons)
@@ -45,20 +49,14 @@ BuildRequires:  cmake(Qt5Test)
 BuildRequires:  cmake(Qt5Widgets)
 Obsoletes:      picmi5 < %{version}
 Provides:       picmi5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
-A nonogram logic game for KDE
+A nonogram logic game by KDE
 
-%if %{with lang}
 %lang_package
-%endif
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -74,14 +72,14 @@ A nonogram logic game for KDE
 
 %files
 %license COPYING*
+%doc %lang(en) %{_kf5_htmldir}/en/picmi/
 %dir %{_kf5_iconsdir}/hicolor/256x256
 %dir %{_kf5_iconsdir}/hicolor/256x256/apps
-%doc %lang(en) %{_kf5_htmldir}/en/picmi/
 %{_kf5_applicationsdir}/org.kde.picmi.desktop
 %{_kf5_appsdir}/picmi/
 %{_kf5_appstreamdir}/
-%{_kf5_debugdir}/picmi.categories
 %{_kf5_bindir}/picmi
+%{_kf5_debugdir}/picmi.categories
 %{_kf5_iconsdir}/hicolor/*/apps/picmi.*
 %{_kf5_kxmlguidir}/picmi/