diff --git a/applications.keyring b/applications.keyring index 9b6ab5c..2998088 100644 Binary files a/applications.keyring and b/applications.keyring differ diff --git a/libkdegames-23.08.4.tar.xz b/libkdegames-23.08.4.tar.xz deleted file mode 100644 index 24ffb38..0000000 --- a/libkdegames-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a5675e50b31abde322a66192f56f5c139b6ff18bce64ed2c6277bcaeed49dec -size 5984140 diff --git a/libkdegames-23.08.4.tar.xz.sig b/libkdegames-23.08.4.tar.xz.sig deleted file mode 100644 index 295d9e8..0000000 --- a/libkdegames-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7+IACgkQu0YzUNbv -Me//zw//bdVhQhRFYAFRSDNc6XpIc0+RvS8q+/lhkEQbwwoGQ8dsgrU0r0WHvMbe -eCORyZdJAPMlSNwH7Uxl9K70jz1tJUOm28EIRakG9QPf/2O2lMNd78h0Ea8FYxaN -n0NvP8Ib9vxVLQmQskXV1jUV0YEnpj0BBQbssLBF/xB1CfPOW4LfORlpaBvfmGBw -YsMBIcXnyUCMMnlGjugSVgFtMUeEpcKc/kn7RFmScofNOjmDRiC64jR9+YJ3UxBb -X+0SjXTKV1RQlAlQoqP2aEAs21+89c3mWu9Pvpl2mW6hWoKPDPyrih3Ztz1WDMNI -hYtJzrmRaY/6NkHR76JAklZsrag03eW0UIKeyPXnbIHZRFy8E8ZnLbngMTCbMl8j -wBoroig+MWYHF25V2LTLa4u2bROdl4RAMnYGibxt9baPoytO1qyACQCNFP9lIWE7 -BCtnxVIVbrRQGbwzDNzek9rwyirA12WzysAnEz9DdWnC/0uIAdIwWbqjipwgajby -YoY4jOG8DLfqlUON/9Bc/+BNvfctjLCX9UYi8ZmdzmiVmqg68n/FeAdSy9THAHMw -tQ9NpdZkd4Wb89Z2wOPbihBzjQgsvGm43VQ9AlGhYdDt2K3lb7f2GvOHEN7UjghL -VpW8rmy3oreMUzp1aL9HpRZ3qUl+Y7dbxwxBCIp6IHbKXN498dc= -=jIdZ ------END PGP SIGNATURE----- diff --git a/libkdegames-24.01.95.tar.xz b/libkdegames-24.01.95.tar.xz new file mode 100644 index 0000000..a2e382d --- /dev/null +++ b/libkdegames-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:849e8c05f5b7ec0c87ad7c0db4122b25337f841bb9336e88acfdc70af9b4507f +size 5991396 diff --git a/libkdegames-24.01.95.tar.xz.sig b/libkdegames-24.01.95.tar.xz.sig new file mode 100644 index 0000000..f1f6c59 --- /dev/null +++ b/libkdegames-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44vgACgkQOmpNuDnq +ptcctw//TjyPOKpcUuLDRsXuNU5T1XEZ36pVGQsc/6wlFINapTkwwO7qv42ceP42 +qZ7CcbJzOHCcF2xyb4kfMSN5828ObfZhv33LhU28T8QiHZ0No7EUbtH+mjZ/P/QX +2nOm0N0OOfNZ2SaFP9al79LHGLHzPnA2EMZa5XYX9ZNT8K9u5e7d4eaaKm2Zmh4G +mk7+V3H71L+2P4GP5irNcn0lQod8beukBvtdOEanay9qT3Et3GfgnFZfsCegNpZ4 +CgGIae/AoCAXu+fFB1BAgtOXZ7lr5qAEhgq0WUDt9pVWcIx0lm7EPanSFlAeNApS +1ZIEd34orpUR1cUXFjpnwP6F5X/FYuJBRvar090nmaf7z4qfehd1w68Hz1MWWT9H +z1OHQvex0pqsIPZK6IJiQZmKVi83+jKiUsIUWPMngV/pGAEpX1pVoHvM29AgZIgk +twhdRRiuLkpEmYgkIbuchyf/C2BTKgR3Uxsx8uAIrfZ7RqHtm6eNyiue6rRD3KZr +bnMKRkgwo8r8qS0OkcOzTGx4YKnHsdOPQZn7HGzNx0+nBshb0t+GtUcWuE6zAQ1W +YdQUflADGlZsquEdFx60j7bLsGmAy8Gavfqbf3q6YYS5iTgmz0fk0ioNK/jon2Zl +D2vyzCyKDS4Uo5mP1UuhYguKDW6eZ48YjuEvrEhAXncmp6s0YXQ= +=HiSd +-----END PGP SIGNATURE----- diff --git a/libkdegames.changes b/libkdegames.changes index e63418f..fccf35a 100644 --- a/libkdegames.changes +++ b/libkdegames.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:09:42 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:23 UTC 2023 - Christophe Marin diff --git a/libkdegames.spec b/libkdegames.spec index b9261fa..3282a63 100644 --- a/libkdegames.spec +++ b/libkdegames.spec @@ -1,7 +1,7 @@ # # spec file for package libkdegames # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,93 +15,77 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 7 +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: libkdegames -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: General Data for KDE Games License: GPL-2.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with released} -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 Patch0: libkdegames-bnc793185.patch -BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: kf5-filesystem +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: libsndfile-devel -BuildRequires: openal-soft-devel -BuildRequires: xz -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5DNSSD) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5Service) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}-kf5 < %{version} -Provides: %{name}-kf5 = %{version} -Conflicts: libkf5kdegames6 < %{version} -# Breaks debuginfo extraction of subpackages -#BuildArch: noarch +BuildRequires: openal-devel +BuildRequires: cmake(KF6Archive) >= %{kf6_version} +BuildRequires: cmake(KF6ColorScheme) >= %{kf6_version} +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6DNSSD) >= %{kf6_version} +BuildRequires: cmake(KF6GuiAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6IconThemes) >= %{kf6_version} +BuildRequires: cmake(KF6NewStuff) >= %{kf6_version} +BuildRequires: cmake(KF6Service) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Core5Compat) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} %description This package contains data which is required by the KDE games library. -%package qt5-imports +%package imports Summary: QML modules for KDE games -License: LGPL-2.1-or-later -Conflicts: libkf5kdegames6 < %{version} -%description qt5-imports +%description imports This package contains QML modules for KDE games. -%package -n libKF5KDEGames%{sover} +%package -n libKDEGames6 Summary: Library for KDE Games -License: LGPL-2.1-or-later Requires: libkdegames >= %{version} -Requires: %{name}-qt5-imports >= %{version} -# libkf5kdegames6 actually contained libKF5KDEGames.so.7 at some point, -# so obsolete that explicitly. -Provides: libkf5kdegames6 = %{version} -Obsoletes: libkf5kdegames6 < %{version} +Requires: libkdegames-imports >= %{version} -%description -n libKF5KDEGames%{sover} +%description -n libKDEGames6 This package contains the KDE games library. %package devel Summary: Library for KDE Games: Build Environment -License: LGPL-2.1-or-later -Requires: libKF5KDEGames%{sover} = %{version} -Requires: libsndfile-devel -Requires: openal-soft-devel -Requires: cmake(KF5Completion) -Requires: cmake(KF5Config) -Requires: cmake(KF5ConfigWidgets) -Requires: cmake(KF5I18n) -Requires: cmake(KF5WidgetsAddons) -Requires: cmake(Qt5Network) -Requires: cmake(Qt5Qml) -Requires: cmake(Qt5QuickWidgets) -Requires: cmake(Qt5Widgets) -Requires: cmake(Qt5Xml) -Obsoletes: %{name}-kf5-devel < %{version} -Provides: %{name}-kf5-devel = %{version} +Requires: libKDEGames6 = %{version} +Requires: cmake(KF6Completion) >= %{kf6_version} +Requires: cmake(KF6Config) >= %{kf6_version} +Requires: cmake(KF6ConfigWidgets) >= %{kf6_version} +Requires: cmake(KF6I18n) >= %{kf6_version} +Requires: cmake(KF6WidgetsAddons) >= %{kf6_version} +Requires: cmake(Qt6Network) >= %{qt6_version} +Requires: cmake(Qt6Qml) >= %{qt6_version} +Requires: cmake(Qt6QuickWidgets) >= %{qt6_version} +Requires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: cmake(Qt6Xml) >= %{qt6_version} %description devel This package contains all necessary files and libraries needed to @@ -109,7 +93,6 @@ develop KDE games. %package -n kdegames-carddecks-other Summary: Further Card Decks for KDE Games -License: LGPL-2.1-or-later Requires: kdegames-carddecks-default = %{version} BuildArch: noarch @@ -118,14 +101,11 @@ This package contains several further card deck set for KDE games. %package -n kdegames-carddecks-default Summary: Default Card Decks for KDE Games -License: LGPL-2.1-or-later BuildArch: noarch %description -n kdegames-carddecks-default This package contains the default card deck set for KDE games. -# Should be called libkdegames5-lang, but that requires replacing the -# macro with the expansion to Provide/Obsolete the old name. %lang_package %prep @@ -135,54 +115,48 @@ This package contains the default card deck set for KDE games. rm -r src/carddecks/svg-konqi-modern %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang libkdegames5 +%find_lang libkdegames6 %fdupes %{buildroot} -%ldconfig_scriptlets -n libKF5KDEGames%{sover} +%ldconfig_scriptlets -n libKDEGames6 %files -# Unversioned -%{_kf5_sharedir}/kconf_update/ -%{_kf5_debugdir}/libkdegames.categories +%{_kf6_debugdir}/libkdegames.categories -%files -n libkdegames-qt5-imports -# Qt/KF-versioned -%license LICENSES/* -%{_kf5_qmldir}/ +%files imports +%{_kf6_qmldir}/org/kde/games/ -%files -n libKF5KDEGames%{sover} -# sover-versioned +%files -n libKDEGames6 %license LICENSES/* %doc README -%{_kf5_libdir}/libKF5KDEGames.so.%{sover} -%{_kf5_libdir}/libKF5KDEGames.so.%{sover}.* -%{_kf5_libdir}/libKF5KDEGamesPrivate.so.%{sover} -%{_kf5_libdir}/libKF5KDEGamesPrivate.so.%{sover}.* +%{_kf6_libdir}/libKDEGames6.so.6 +%{_kf6_libdir}/libKDEGames6.so.6.* +%{_kf6_libdir}/libKDEGames6Private.so.6 +%{_kf6_libdir}/libKDEGames6Private.so.6.* %files devel -%{_kf5_cmakedir}/KF5KDEGames/ -%{_kf5_includedir}/KDEGames/ -%{_kf5_libdir}/libKF5KDEGames.so -%{_kf5_libdir}/libKF5KDEGamesPrivate.so +%{_kf6_cmakedir}/KDEGames6/ +%{_includedir}/KDEGames6/ +%{_kf6_libdir}/libKDEGames6.so +%{_kf6_libdir}/libKDEGames6Private.so %files -n kdegames-carddecks-other %license LICENSES/* -%doc README -%exclude %{_kf5_sharedir}/carddecks/svg-oxygen-air -%{_kf5_sharedir}/carddecks +%{_kf6_sharedir}/carddecks/ +%exclude %{_kf6_sharedir}/carddecks/svg-oxygen-air %files -n kdegames-carddecks-default %license LICENSES/* -%doc README -%{_kf5_sharedir}/carddecks/svg-oxygen-air +%{_kf6_sharedir}/carddecks/svg-oxygen-air/ -%files lang -f libkdegames5.lang +%files lang -f libkdegames6.lang %changelog