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

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

diff --git a/rocs-21.03.90.tar.xz b/rocs-21.03.90.tar.xz
deleted file mode 100644
index 77ab149..0000000
--- a/rocs-21.03.90.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86c8dd0def4b7b32cdf7dbcfb85fbc028404448ca997cb6d67aabbbc4b20f49e
-size 1541468
diff --git a/rocs-21.03.90.tar.xz.sig b/rocs-21.03.90.tar.xz.sig
deleted file mode 100644
index dc7c254..0000000
--- a/rocs-21.03.90.tar.xz.sig
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmBwCsEACgkQu0YzUNbv
-Me+BFxAAjyt9DytSJfU+tHO4NumzhT7ivYGG5CAP9/6VOfyeZwM+/EGPJUAqSdux
-OB+7yizgLV/81FV7ZM2mc6bXVpPaE44ENmzdne2AsL5UDQhMkRo+Rh8/SKlgkffH
-jnb3DMt43SW9L4aaAzIi3W0z02qOHUBcAxD/aLekfwtg990DsUjaib57hEvDllYz
-HH7PTzDvw3F2joqMfMqO06PX+swJoRwAF8+3AWli07DGZEKvZHC8095KhokzR4kY
-WCp5FL5EWsdCOS+b7OJXzLY042QvAFb8t5v7lBTNh9pp720WGcEUi91dz1D07gEW
-ju6Qwbm2zZDUo2XKZbwfAag/zk+pB6skVZClMr4aaL47rzxlRtXfKYFkdfEOctvk
-9xufooWNgfOyyexOL9WigjjVnLCmL1RicMfTX36OLvn3rXXpEhCbm1pRnJBb2csL
-7R5J48SHKjJ47zZScTwX0mwYQJr1HS11U46NDv9glUUncd05Ec2MlSvvlJzdxNOP
-mO+cBVCOk1MiFnoVoK+gfpoqqUAi6/eDe8FF0KWERi5lDM/6i5VYjfFZue0Flyh4
-whp28s9ApRXNMv5lKoEOElLIS7/wqLcMrYJFgrHAPLE4LPdSjuBfJI7EPtD7aVlY
-u8aposCElQUvKju4smXH/Mmpd4aB6KsFTOSXtrUuGM7WVfssbEg=
-=vX4e
------END PGP SIGNATURE-----
diff --git a/rocs-21.04.0.tar.xz b/rocs-21.04.0.tar.xz
new file mode 100644
index 0000000..865d04b
--- /dev/null
+++ b/rocs-21.04.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4409aafdd1de993d793cbee41386d6febf7d333098cec2e11fb97b06a7edf87
+size 1542124
diff --git a/rocs-21.04.0.tar.xz.sig b/rocs-21.04.0.tar.xz.sig
new file mode 100644
index 0000000..eecc4f2
--- /dev/null
+++ b/rocs-21.04.0.tar.xz.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwsACgkQu0YzUNbv
+Me/wpA/+JdFYa4Ya3A5C3tcUrEIvaJXTFyql1IXO3A2GGhCrhXYSTNHCxqq9DgK0
+n40QCGbos+O6AIbY5ZK6Mnp6RMw9I8I/5xc2EsMIsqkSpWs5eI5ct/sJsTKTyBHh
+p0SqDAP+Ybk6x+Sq4tOgZm3UIAfyyUvo6tXXmRLdIz4vycx9xwGki9qCPpnyjkWa
+TbDPRa/RS97ymiAF2jJ6dl1g3YOH8U4WFD7v1pLZN5C/i8qFncjVppwQw7lsTvmk
+o+T5/qE4ktRsEL4I0yjqR4NjYaUvH7iZChAENO1Pyucv32v39tK4VEgnpSkeruBj
+PjfAe/YUSAx64o7f/C0DGyH/vZ8elPD4/majogtEvyhhxDGpsosKkw1zaOYSxG80
+fkSQXwChpaf1/9sxvgAlRZXizXgbTTceLnh50qRBcvH0YY8BK/ubj/nfeB11/ZR7
+0sPIAl5SRupJu4kNfIU7IpX10lGUYGS21X+9dfwXWtKUt2/Jd5Uwaw3uPCRh3uMn
+zBxuFfTjXSO4180/xInhQ6z/hGZrl/qGPgMBlRHWhstxBKE6XFl8uCrwN7Q4G7oI
+NlJxVObcfeHAOWI1hYrbxZtJ3gc9k7AtMCIVjLvJEmFdWDESkUOJ4stORG/ITVqI
+sLq+5n4Sqs0wOPQpA+0Vz+0hv2kBFsTJe37qgFOXXGLf9iYiXws=
+=cHHr
+-----END PGP SIGNATURE-----
diff --git a/rocs.changes b/rocs.changes
index 69b2c51..592ef76 100644
--- a/rocs.changes
+++ b/rocs.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:25 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:50 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 
diff --git a/rocs.spec b/rocs.spec
index 53f1158..fcd7752 100644
--- a/rocs.spec
+++ b/rocs.spec
@@ -21,13 +21,17 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           rocs
-Version:        21.03.90
+Version:        21.04.0
 Release:        0
 Summary:        Graph Theory IDE
 License:        GPL-2.0-or-later
 Group:          Amusements/Teaching/Mathematics
-URL:            https://edu.kde.org
-Source:         https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+URL:            https://apps.kde.org/rocs
+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:  fdupes
 BuildRequires:  libboost_headers-devel
@@ -58,10 +62,6 @@ BuildRequires:  cmake(Qt5Widgets)
 BuildRequires:  cmake(Qt5XmlPatterns)
 Obsoletes:      %{name}5 < %{version}
 Provides:       %{name}5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif
 Recommends:     %{name}-lang
 
 %description
@@ -96,7 +96,7 @@ to build software using Rocs.
 %lang_package
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %ifarch ppc ppc64
@@ -121,7 +121,6 @@ export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %license COPYING*
 %doc ChangeLog README.md
 %doc %lang(en) %{_kf5_htmldir}/en/rocs/
-%dir %{_kf5_appstreamdir}
 %{_kf5_applicationsdir}/org.kde.rocs.desktop
 %{_kf5_appstreamdir}/org.kde.rocs.appdata.xml
 %{_kf5_bindir}/rocs