From c44aa26d9db81e29171abac7974fb8f339f54734186f835af91dd7464f3948ab Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 28 Mar 2021 07:27:48 +0000 Subject: [PATCH] 21.04 beta OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/libkdegames?expand=0&rev=147 --- ...-missing-module-identifier-to-qmldir.patch | 21 ---------------- libkdegames-20.12.3.tar.xz | 3 --- libkdegames-20.12.3.tar.xz.sig | 16 ------------- libkdegames-21.03.80.tar.xz | 3 +++ libkdegames-21.03.80.tar.xz.sig | 16 +++++++++++++ libkdegames-bnc793185.patch | 8 +++---- libkdegames.changes | 10 ++++++++ libkdegames.spec | 24 +++++++++---------- 8 files changed, 44 insertions(+), 57 deletions(-) delete mode 100644 0001-Add-missing-module-identifier-to-qmldir.patch delete mode 100644 libkdegames-20.12.3.tar.xz delete mode 100644 libkdegames-20.12.3.tar.xz.sig create mode 100644 libkdegames-21.03.80.tar.xz create mode 100644 libkdegames-21.03.80.tar.xz.sig diff --git a/0001-Add-missing-module-identifier-to-qmldir.patch b/0001-Add-missing-module-identifier-to-qmldir.patch deleted file mode 100644 index 17dff14..0000000 --- a/0001-Add-missing-module-identifier-to-qmldir.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 681d7041f0e9f50735bcea3b3b896e0155111950 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -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 - diff --git a/libkdegames-20.12.3.tar.xz b/libkdegames-20.12.3.tar.xz deleted file mode 100644 index 8e97924..0000000 --- a/libkdegames-20.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:401b919640eea95ec8feab1ce0914db2750fafc19893c424eed8ea37e5e216d1 -size 6389576 diff --git a/libkdegames-20.12.3.tar.xz.sig b/libkdegames-20.12.3.tar.xz.sig deleted file mode 100644 index 1e2d733..0000000 --- a/libkdegames-20.12.3.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/libkdegames-21.03.80.tar.xz b/libkdegames-21.03.80.tar.xz new file mode 100644 index 0000000..e89949b --- /dev/null +++ b/libkdegames-21.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c600358504622f57f015f72ab65faf84effe0b12dcf49461c156fbc3c343d1de +size 6388632 diff --git a/libkdegames-21.03.80.tar.xz.sig b/libkdegames-21.03.80.tar.xz.sig new file mode 100644 index 0000000..f9a5652 --- /dev/null +++ b/libkdegames-21.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmBXHt4ACgkQOmpNuDnq +ptfiCA//bmyUOCggstEQ3tEQA3mzJEAo6m7ZRvUnG4AhJOv9SUIuBWPjfLpVQ95X +s+AHgpeM/ff5hlxI8Revfpn0q0BkXCgdyMwNcagTAnOle7C9L/Z6rlmJUMhgg56Z +L6+Ab26kZc8/eP5ezziVy4cJWOyydHm+HNbHhkjTObLCbR9ELww286uUmNd3fZp+ +DRs7ee+1p2BlsY5fV77pe3NTQ8kMTxLW4A4QOlewLtz1aELMl2+sVi+r1CqebHJD +OrXlgGCzMJK7fVkrB6RfiC1O/lsXHjMO4T/K1FSzWbFCCKM9SFFtf8lZJuEiW+uD +1rrLkBPBelobqM31V4LWK5Tf6P53VPEdSTQylclrQWaEYuTaWlguvQTkpKxrrCOi +BhO1ZbJhLawjX+Zx+s3hAJe4Ts2AuIV1CMBt67JGTDJY/8yNJCTO06sLddeitWTn +O28LcY8jtkyOsJBWb619v3vPClWm2Ayf4VJHBWbsQcW1dVpNiIdbTEi1/7TbhoTF +HN67M5SeJRcg22d+P4dokWjE6DQ9+wwHKCmVIPwbgOvKPCACr1vLzG07qxGAoRtg +MWKMTQEvBWCUmtuvf2MfQ3/LDqTngdCqqs6PXM03yZrtsLr1k6qNZvvEq8EYvQ5f +oWzVWI07GqE6oxacNAT0Eod88LybiIupTFgexc4UWWHgTPnC4KM= +=Chd/ +-----END PGP SIGNATURE----- diff --git a/libkdegames-bnc793185.patch b/libkdegames-bnc793185.patch index c21a959..69a1228 100644 --- 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 ) diff --git a/libkdegames.changes b/libkdegames.changes index 3814d5c..da6601a 100644 --- a/libkdegames.changes +++ b/libkdegames.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Mar 21 13:29:30 UTC 2021 - Christophe Giboudeaux + +- 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 diff --git a/libkdegames.spec b/libkdegames.spec index 8e50a53..2ff2584 100644 --- a/libkdegames.spec +++ b/libkdegames.spec @@ -21,16 +21,14 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libkdegames -Version: 20.12.3 +Version: 21.03.80 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 +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Patch0: libkdegames-bnc793185.patch BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -69,7 +67,7 @@ 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 +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif @@ -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,12 +149,12 @@ 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_libdir}/libKF5KDEGames.so.* %{_kf5_libdir}/libKF5KDEGamesPrivate.so.* @@ -164,7 +162,7 @@ This package contains the default card deck set for KDE games. %{_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