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/libkmahjongg-23.08.4.tar.xz b/libkmahjongg-23.08.4.tar.xz deleted file mode 100644 index 52e6422..0000000 --- a/libkmahjongg-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3052bd39de55d70bc543711a629c5aa12f2dcc06d64a937370921002e6fde232 -size 1688424 diff --git a/libkmahjongg-23.08.4.tar.xz.sig b/libkmahjongg-23.08.4.tar.xz.sig deleted file mode 100644 index d9bc196..0000000 --- a/libkmahjongg-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7+cACgkQu0YzUNbv -Me8dnA//QIFqa5TV/y4dUInXjefEBifjGQcBoRbf+Wdr1nSm24nH+YB3RFHR1Nu9 -NlNW2QWpPuyPu0hq8qAG9Le9nVtewEAL5+g61wIvo3tCZZCacy3otpIm7Ku6bdTs -CDU5RLX/EO9HWm/w9szw7DwUByy/pgk5qd8GGs50SW6DWLTWv4w7gQEBAUeF4fQV -2TXMplNWQw7bqqn5h6CYbXiIwBPoCCjvq3p1f2UIzJrYXo20Prk5DXvu+AwSr72J -JyVqyVzeUy4XYo6Pl2frxzw9XLhNvLPQ35nNngHmncqEHtRmNCeGHZa95PrgH5jg -GbrCAupeINnpWczudqnq/Z3YcKFNVEL71WkatmjZlR7C9+xx0Vw9qmxKgr+m70nY -ylKPuE2sfL45eIRqbD8/cWLh2zvKxM/NUtz8+3vDaf244A+in8UA5/vdpQ/bt1aB -BVMds/DkiASM4ddrqEdigaby7E2ePgtYobj545a4YjDcBmn0Tho9KDuD+Y5qkcFk -FFcBd0t9gKgw9M9PfbadYXLKgtQHeQvhprEym82TiMZp/Rn5b+m4p9K3/b2LaUJo -1bhmOvfwHZaqwcde9fdX3/yKcZACbY6jpk2CYQvqEJ18II4bTce1wFQ5N0nzHdpz -ZQJzQMxexv8Aq3Hj4Jto4xI5D4UWzZSOIw685p3xNbb6KLrA9qU= -=CA9G ------END PGP SIGNATURE----- diff --git a/libkmahjongg-24.02.0.tar.xz b/libkmahjongg-24.02.0.tar.xz new file mode 100644 index 0000000..8351660 --- /dev/null +++ b/libkmahjongg-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6577601ed7baf2f1c42130ae2e6d19b99ea926d14f82a0461a46b374c1967c5 +size 1690900 diff --git a/libkmahjongg-24.02.0.tar.xz.sig b/libkmahjongg-24.02.0.tar.xz.sig new file mode 100644 index 0000000..573d887 --- /dev/null +++ b/libkmahjongg-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrTYACgkQu0YzUNbv +Me8NHQ/+Jw+3OuAM76qCT1B5Sozkt9hObKps9iF0cYz7X1/91WXPJizNTC+PXcbv +1iHEX4/Y4iq9c4mfU2ZG1/0y5PwhEb+wAVlN/WRbY5qn+2O7HtAQzk2CDMnCFX3I +/z/AKq0TbohCo16oBztF/JaeUOhhjShjubbq2Zmhwab9EK47AToroa5jVWmK1P13 +Q7Sz6wEodTdRxd+DqZPKu2cmW0A1ZhvSDFkkvLp8HvdVfa33zWEJQEBvcg8KHff8 +NesIgVqgr/lFnTt3nxsx7v5EXbKkcX/Gym7PgmuvoZcI/3WlOUAcUW6EiHTfq0Mv +ePu+hijMb13HorpnBmTjlWSwm0aZPcVjDPesXbCEk2OHm+865t+PGsSo1pgRSmxo +CoSmDJAjQNyb5G0+f1T2YFtx/6PDgONloHPXHnjU0Y+gUh7c+MHMQyVLuUuO0eKA +040Ajov1Tpf3heknHtXh4in/LPcZsoXvBYK3FKcLVaK51Nso+5/UZgCfMtaoo6To +QF/73W7f0OE0viXldrqz30b/9Xk4fQJtPZzEXD/CTY5fpmz343gT1zfv213BhnaW +A6GkeRdCdP5VKGKqf68WW0GIBqsWFjorF6ChATLUOdzBJk80nIJAUflQcxeu+0ql +xsOPTOR0/Pyz9GgSRDfk2fA+q9llBWxhvm+RoXrO3yf84a9nEcA= +=VH1L +-----END PGP SIGNATURE----- diff --git a/libkmahjongg.changes b/libkmahjongg.changes index 0762e7f..7a9a019 100644 --- a/libkmahjongg.changes +++ b/libkmahjongg.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 23 14:00:40 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Fri Feb 9 16:09:48 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Fri Dec 15 21:31:28 UTC 2023 - Christophe Marin diff --git a/libkmahjongg.spec b/libkmahjongg.spec index cd0ac49..d425cef 100644 --- a/libkmahjongg.spec +++ b/libkmahjongg.spec @@ -1,7 +1,7 @@ # # spec file for package libkmahjongg # -# 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 @@ -16,48 +16,50 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: libkmahjongg -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: General Data for KDE Games -License: GPL-2.0-or-later +License: LGPL-2.1-or-later AND 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: %{name}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: %{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif -BuildRequires: extra-cmake-modules BuildRequires: fdupes -BuildRequires: cmake(KF5Completion) -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6ConfigWidgets) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} Obsoletes: %{name}-kf5 < %{version} Provides: %{name}-kf5 = %{version} %description -This package contains data which is required by KDE games. +Common code, backgrounds and tile sets for games using Mahjongg tiles. -%package -n libKF5KMahjongglib5 +%package -n libKMahjongg6 Summary: Library for Mahjongg tiles -License: LGPL-2.1-or-later -Requires: libkmahjongg +Requires: libkmahjongg >= %{version} -%description -n libKF5KMahjongglib5 -This package contains the library for Mahjongg tiles. +%description -n libKMahjongg6 +Common code, backgrounds and tile sets for games using Mahjongg tiles. %package devel Summary: Library for Mahjongg tiles: Build Environment -License: LGPL-2.1-or-later -Requires: libKF5KMahjongglib5 = %{version} +Requires: libKMahjongg6 = %{version} +Requires: cmake(KF6ConfigWidgets) >= %{kf6_version} +Requires: cmake(Qt6Gui) >= %{qt6_version} Obsoletes: %{name}-kf5-devel < %{version} Provides: %{name}-kf5-devel = %{version} @@ -71,33 +73,32 @@ develop games that uses Mahjongg tiles. %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -%find_lang %{name} --with-man --all-name +%find_lang %{name} --all-name %fdupes -s %{buildroot} -%ldconfig_scriptlets -n libKF5KMahjongglib5 +%ldconfig_scriptlets -n libKMahjongg6 %files -%doc README -%{_kf5_debugdir}/libkmahjongg.categories -%{_kf5_sharedir}/kmahjongglib/ +%{_kf6_debugdir}/libkmahjongg.categories +%{_kf6_sharedir}/kmahjongglib/ -%files -n libKF5KMahjongglib5 +%files -n libKMahjongg6 %license LICENSES/* %doc README -%{_kf5_libdir}/libKF5KMahjongglib.so.* +%{_kf6_libdir}/libKMahjongg6.so.* %files devel -%doc README -%{_kf5_cmakedir}/KF5KMahjongglib -%{_kf5_includedir}/KMahjongg/ -%{_kf5_libdir}/libKF5KMahjongglib.so +%{_includedir}/KMahjongg6/ +%{_kf6_cmakedir}/KMahjongglib6/ +%{_kf6_libdir}/libKMahjongg6.so %files lang -f %{name}.lang