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

OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/minuet?expand=0&rev=183
---
 minuet-21.03.90.tar.xz     |  3 ---
 minuet-21.03.90.tar.xz.sig | 16 ----------------
 minuet-21.04.0.tar.xz      |  3 +++
 minuet-21.04.0.tar.xz.sig  | 16 ++++++++++++++++
 minuet.changes             | 10 ++++++++++
 minuet.spec                | 17 ++++++++---------
 6 files changed, 37 insertions(+), 28 deletions(-)
 delete mode 100644 minuet-21.03.90.tar.xz
 delete mode 100644 minuet-21.03.90.tar.xz.sig
 create mode 100644 minuet-21.04.0.tar.xz
 create mode 100644 minuet-21.04.0.tar.xz.sig

diff --git a/minuet-21.03.90.tar.xz b/minuet-21.03.90.tar.xz
deleted file mode 100644
index 782b05f..0000000
--- a/minuet-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef21b1afe22842ceb2a6206e2adf21ef1591e4025fc900c6869c80fda1121e17
-size 27726172
diff --git a/minuet-21.03.90.tar.xz.sig b/minuet-21.03.90.tar.xz.sig
deleted file mode 100644
index 1e935ef..0000000
--- a/minuet-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsAACgkQu0YzUNbv
-Me/g7w//Sl1AEdtGfPftBTSYSNrbsZ+LWX7BCCNIRSDmInnhIfVBHc1+dNrBE6OR
-aakOm7VbXQwsUvtBch5M8FOalMVBybbIuIZrEVaFG55KDKEat0McaB5v7Nl2ajP5
-JeDMpgfCbLW4sWvDGIWWzq81eYxWd8c0GkbDDVuvW1PPIvWOXzn8q/dBWhIhgsPO
-udK2mVZjTI6dmMZgsvu3nPARLjiUOwwlNqkvcz0cTOQIl5xdYgFQASw/iBhuIwtV
-3ZtyzMzx4ugkeOU27vZg2hT7QwGs0JSADjlp+3ZCvxdePwb3B25C5ehx78sgmDqb
-LaIAWiiffVjWchfY2y+DylI79PNT10/3MrpiS034lKvifPSkYkIB2maZQBr6N4DL
-6ngPrzVrFVDXrjD+mwOewzgi+vQkvjaUKF6OTbS5D9D98n7z68bm+1mIluARI481
-2/j6tvfhgKPG/CxaKnShD1boe6ajQVV/dMBjeYhr3T0E86hUS0fZ4/PX1WmO4G0X
-ca6hK/zfkJkmiZtSHVNpdwaZYj5x6ixc6ve4bqLzLAPxZvbieA3taVoJCsZgYd9U
-NYXZplNICjXJeZ0jwMBHBIHR2/+YaUVJYvmBzAXw3ZBcbz9hTsygA/Y3/A4w2H1q
-PHlFWpahIAT4/5KhDvCTgmwKvvE8ii0sCdMDhLsZXfzGhhNcxSo=
-=ASj9
------END PGP SIGNATURE-----
diff --git a/minuet-21.04.0.tar.xz b/minuet-21.04.0.tar.xz
new file mode 100644
index 0000000..8a9f4bc
--- /dev/null
+++ b/minuet-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27315b7376428683c8f94e79d7b08c67c8b3609e17dc354cf0ee907700ba5836
+size 27724432
diff --git a/minuet-21.04.0.tar.xz.sig b/minuet-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..e31ded4
--- /dev/null
+++ b/minuet-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwkACgkQu0YzUNbv
+Me/8iA//fJe8mLXR0Zy8bxCVs9g9ROvX81FnIBvAVch226O+hp8N18PuLPTMaePh
+N63Nqq3Gw6SauOx+lPT50kQpamgxus3L41MYdfJ2OZGaPuoH/jyPBee5mIdxFIu2
+6HwhCfkOY5i94WNtC6N7MEyBKn/qP/7bFQF2Fu+wAD5mqVHSWO263rBc8n82sP6F
+I7SO/fKKmLrgxykgjEefF6+d7Kx2Yh/Bbqa2sufV+KcU7cZmGX1TNx5nMejkk724
++m/0uiB7lhtMEOx5Ge7lhdrGZK1cL52oYaY4FI9cEbTgAwTmhvkl7cy7hxrak+5V
+vaKNBueWAk/QhkIdT/hMdrvZL2Gcr+UCt+TwpqonWns1SxJtjO+JiMtQ2CWnK6Nd
+pd1yfBiqkg15jznzew7ZEfvVneEBzBirznhnrwEqt0qbtA/8A8c86DMTj9/ZqBvV
+dpZRSr+4pf+uKLOs2X0/7VJ/LqtuCZKqf9KYOr7/im0KvVvfgY4UwSszl92AgmbP
+PyFgRgnZOQmoJXTDqALnQZE6MJVv0xOUVW6V8v4gBkr2gLx1Dz92Y/j9DI0v2UAq
+RW11qOA+LoiJAL5SnxYNuOGsnCQ+BuraFkiF7+813UHRlyunlyfXGjbSZuNtJ28E
+JkGJncZA9CxeFFYeOlWPJJYV6Mp+AJT9bF23a/INsv3gPj07Sw4=
+=s0c0
+-----END PGP SIGNATURE-----
diff --git a/minuet.changes b/minuet.changes
index e58a40b..1b9f127 100644
--- a/minuet.changes
+++ b/minuet.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:18 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
+- Stop owning directories provided by the filesystem package (boo#1184786)
+
 -------------------------------------------------------------------
 Fri Apr  9 17:41:43 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/minuet.spec b/minuet.spec
index 64bd8fb..4be0785 100644
--- a/minuet.spec
+++ b/minuet.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           minuet
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        A KDE Software for Music Education
 License:        GPL-2.0-or-later
 Group:          Productivity/Other
-URL:            https://www.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/minuet
+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:  kf5-filesystem
 BuildRequires:  pkgconfig
@@ -46,10 +50,6 @@ BuildRequires:  pkgconfig(fluidsynth)
 # Runtime requirement
 Requires:       libqt5-qtquickcontrols2
 Recommends:     %{name}-lang
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 
 %description
 Application for Music Education.
@@ -73,7 +73,7 @@ Development headers and libraries for Minuet.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
   %cmake_kf5 -d build
@@ -93,7 +93,6 @@ Development headers and libraries for Minuet.
 %files
 %doc README*
 %license COPYING*
-%dir %{_kf5_appstreamdir}
 %doc %lang(en) %{_kf5_htmldir}/en/minuet/
 %{_kf5_applicationsdir}/org.kde.minuet.desktop
 %{_kf5_appstreamdir}/org.kde.minuet.appdata.xml