Accepting request 887761 from KDE:Applications

KDE Gear 21.04 OBS-URL: https://build.opensuse.org/request/show/887761 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libkdegames?expand=0&rev=110
2021-04-25 19:27:09 +00:00 · 2021-04-25 19:27:09 +00:00 · c6585aff3d
commit c6585aff3d
parent f6d496a2c7 ece3f8fd55
8 changed files with 63 additions and 60 deletions
--- a/0001-Add-missing-module-identifier-to-qmldir.patch
+++ b/0001-Add-missing-module-identifier-to-qmldir.patch
@ -1,21 +0,0 @@
-From 681d7041f0e9f50735bcea3b3b896e0155111950 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
-Date: Tue, 15 Dec 2020 13:26:45 +0100
-Subject: [PATCH] Add missing module identifier to qmldir
-
---
- declarativeimports/qml/qmldir | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/declarativeimports/qml/qmldir b/declarativeimports/qml/qmldir
-index 79aae321..bfc17a4e 100644
--- a/declarativeimports/qml/qmldir
-+++ b/declarativeimports/qml/qmldir
-@@ -1,3 +1,4 @@
-+module org.kde.games.core
- plugin corebindingsplugin
- 
- KgItem 0.1 KgItem.qml
-- 
-2.25.1
-
--- a/libkdegames-20.12.3.tar.xz
+++ b/libkdegames-20.12.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:401b919640eea95ec8feab1ce0914db2750fafc19893c424eed8ea37e5e216d1
-size 6389576
--- a/libkdegames-20.12.3.tar.xz.sig
+++ b/libkdegames-20.12.3.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmA9kEcACgkQu0YzUNbv
-Me8mmQ//YZk8b8BaDgoNEEEQ6M1Ks16Kldh6J6OoYjz/JHj2D2mWSCmA/LixFnAa
-LxDe2o37PAN0ReGy7B2tjryYxe1X7J+58QnwTlSGc43JLhgFrStDl0ktBnmrQRX9
-H6I52rJdJ2Tkp6GPSXpw7Js2ITnIhZ/J50dPH1q1VmJAOW0IAod84mv9gkiLz0xc
-j/zt1kTgRuRWHklfMI6sCx7lwNV6m+sooZx6FqIExgoKLOKSaCoRobaSGOv+4IMm
-LrwEM//y4E2lSGcKGbcYhI4QAWuglHSwQYvxosAJNJwQzTfa5hnfDP5+2p4a6qad
-A2tA9JGcB73e9zoYcS1Ghr9kRw8orHrMpbNYybRxisYXV6COiEpIkcGAei0Xi4vY
-5sBn1lh8nVZOZNOpBtrmTd4A4YeAsNjW/XM+4GINMzH9u3HMmz+lVZMoxC6V04dV
-vIZt0rlKJv9oppPMWUXXMUQoBNXfKXDd/LfJme9ajygklqtht5qfet75SgD6SjNG
-8hyYXk+Z6FnOtPr7ZZeGyGqIe31XcILkD3nBtBviwNMwkHhnICWHw2hUjsIfsPsC
-GhSP2R/hWTgrtWgBsitGDmIf2kxo1jWnoyRHmdztFzALU4mEiOqqk6K7OKqzIBNJ
-nfxCn5W2HRmoPQki5K5wBve230p0b50dJQ1nSWm9cSnXL3ZWgGc=
-=2ylH
-----END PGP SIGNATURE-----
--- a/libkdegames-21.04.0.tar.xz
+++ b/libkdegames-21.04.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4766ce2c73a17b05a7a79c326edaa2c29718719218f48d7ea7543f31f02415e0
+size 6390828
--- a/libkdegames-21.04.0.tar.xz.sig
+++ b/libkdegames-21.04.0.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmB5VwcACgkQu0YzUNbv
+Me/gWRAAjhm1W4vEefQeGAB/ZfMe8hDqIYkceghURlLJUY3MRbvMPlu+j3cXggAy
+XuvEtS4XkIRUfy9glvwWjH0lyL4VNxi/2cFxzN1BJjusp//IRg8poxT5scGfNpnN
+BR4/yNFG97ICqERdwsmbDofi9VCPf607UQKQY6f4W7kCGjIJux9wMpq2G1Z8YvNW
+KHz0LF5JrrLjdtBBJNrVTe+uA/mgf6o0KR3FTGeIO6Kb+b54+1yfQeZsb+4UATja
+922gvn4P1ZwXMmMXRfQZrhYI2E5aNU93fdr+hYnEZUn1ZGqnFB5wuJJnFNc917g/
+XscteQ4RCudre8jD6JPk9ej7rL0f0yGS/f321TMgHjPdTsmETj8F+jADAUSj7TxY
+xYFb6/iXW7NYS2SVnFYBt5gHTeHGzu/bK19nvJJiqXpM8UCvQSVY/blCuGDpxnLP
+5PFDeInMiKKttgmlM4k0Tkfn5NuRNzQDnHkO3gz79iZejB7qGlmSvhBRhuoNS9Kw
+Gil/FzLYzAyqrLBPelSIlZDE1GG+Qcc7/G80QjHzgM2A/l6aeLrELDQhNbljHyHs
+72m18QSSWTqhchAfQd45hvo+QA/cj38DnTo2c49XrjlZq4v0FXwX09ZkZUXEqOE9
+Ny50CI/7GpmwZjNftmDdMXU/9yJVZ14q9Is2BDV2OMb7QAupxyo=
+=Ahf1
+-----END PGP SIGNATURE-----
--- a/libkdegames-bnc793185.patch
+++ b/libkdegames-bnc793185.patch
@ -1,7 +1,7 @@
-Index: libkdegames-4.9.90/carddecks/CMakeLists.txt
-===================================================================
--- libkdegames-4.9.90.orig/carddecks/CMakeLists.txt
-+++ libkdegames-4.9.90/carddecks/CMakeLists.txt
+diff --git a/src/carddecks/CMakeLists.txt b/src/carddecks/CMakeLists.txt
+index 2a610a91..676442b0 100644
+--- a/src/carddecks/CMakeLists.txt
+++ b/src/carddecks/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory( svg-dondorf )
 add_subdirectory( svg-future )
 add_subdirectory( svg-gm-paris )
--- a/libkdegames.changes
+++ b/libkdegames.changes
@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Apr 16 16:13:04 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.04
+- No code change since 21.03.90
+
+-------------------------------------------------------------------
+Fri Apr  9 17:41:29 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.90
+  * New feature release
+- No code change since 21.03.80
+
+-------------------------------------------------------------------
+Sun Mar 21 13:29:30 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.03.80
+  * New feature release
+- Too many changes to list here.
+- Drop upstream patch:
+  * 0001-Add-missing-module-identifier-to-qmldir.patch
+- Rebase libkdegames-bnc793185.patch
+
 -------------------------------------------------------------------
 Thu Mar  4 06:11:37 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>

--- a/libkdegames.spec
+++ b/libkdegames.spec
@ -21,16 +21,18 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           libkdegames
-Version:        20.12.3
+Version:        21.04.0
 Release:        0
 Summary:        General Data for KDE Games
 License:        GPL-2.0-or-later
 Group:          System/GUI/KDE
 URL:            https://www.kde.org
 Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
-Patch1:         libkdegames-bnc793185.patch
-# PATCH-FIX-UPSTREAM
-Patch2:         0001-Add-missing-module-identifier-to-qmldir.patch
+%if %{with lang}
+Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source2:        applications.keyring
+%endif
+Patch0:         libkdegames-bnc793185.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
 BuildRequires:  kf5-filesystem
@ -68,10 +70,6 @@ BuildRequires:  cmake(Qt5Widgets)
 Recommends:     %{name}-lang
 Obsoletes:      %{name}-kf5 < %{version}
 Provides:       %{name}-kf5 = %{version}
-%if %{with lang}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
-Source2:        applications.keyring
-%endif

 %description
 This package contains data which is required by the KDE games library.
@ -82,7 +80,7 @@ This package contains data which is required by the KDE games library.
 %autosetup -p1

 # bnc#793185
-rm -rf carddecks/svg-konqi-modern
+rm -r src/carddecks/svg-konqi-modern

 %build
  %cmake_kf5 -d build
@ -151,20 +149,20 @@ BuildArch:      noarch
 This package contains the default card deck set for KDE games.

 %files
-%license COPYING*
+%license LICENSES/*
 %doc README
 %{_kf5_sharedir}/kconf_update/

 %files -n libkf5kdegames6
-%license COPYING*
+%license LICENSES/*
 %doc README
+%{_kf5_debugdir}/libkdegames.categories
 %{_kf5_libdir}/libKF5KDEGames.so.*
 %{_kf5_libdir}/libKF5KDEGamesPrivate.so.*
 %{_kf5_qmldir}/
-%{_kf5_debugdir}/libkdegames.categories

 %files devel
-%license COPYING*
+%license LICENSES/*
 %doc README
 %{_kf5_cmakedir}/KF5KDEGames/
 %{_kf5_includedir}/KF5KDEGames/
@ -172,19 +170,19 @@ This package contains the default card deck set for KDE games.
 %{_kf5_libdir}/libKF5KDEGamesPrivate.so

 %files -n kdegames-carddecks-other
-%license COPYING
+%license LICENSES/*
 %doc README
 %exclude %{_kf5_sharedir}/carddecks/svg-oxygen-air
 %{_kf5_sharedir}/carddecks

 %files -n kdegames-carddecks-default
-%license COPYING
+%license LICENSES/*
 %doc README
 %{_kf5_sharedir}/carddecks/svg-oxygen-air

 %if %{with lang}
 %files lang -f %{name}.lang
-%license COPYING*
+%license LICENSES/*
 %endif

 %changelog