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/kmahjongg-23.08.4.tar.xz b/kmahjongg-23.08.4.tar.xz deleted file mode 100644 index 2b3c37a..0000000 --- a/kmahjongg-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6057e05d12ebb16eabb417243134444c8f791c66a2a6a039a608b7d2c9a0f69d -size 4101040 diff --git a/kmahjongg-23.08.4.tar.xz.sig b/kmahjongg-23.08.4.tar.xz.sig deleted file mode 100644 index 3397d35..0000000 --- a/kmahjongg-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu73oACgkQu0YzUNbv -Me/AHQ//ejI08RvhtW18Sy5qGScP7eHzKC8DLORmMZwMZYbeZC3TwDH+V7jr8Gzf -KTaw3EcZ6wUV8VEQbyX+wq5kuqZ5z5OeNuLwhRlUcPumsrcuqNs12kjjzqXS7a2o -t6dCx1kl6VKdQ5uqiJBqM4P5fvRvoTJQ+HOohQhz6KTOKXgDNHgm1eZAKmmNMmLR -aVM2lqaIzMpsQOyAN6SOE6L0enbaoCuoXOjiiCWY5UEvN6eW0aW+hFjkrTuk72Cr -rGxDxo7c7EQRKPgOsetpXmzo0448G9cg7FPQ+cgv3MzeEnk2CJafyx7Jdwz6qTli -9ghp7Y5XCpz/NxfPpKPVaWIfSFBnIvi6yDj0K1hXAdcwdbRaWpp6cG0l28wIjcFa -FhEq5ZRVdISIha4wC0jMrPE+OF1x7pSbQN9fvWm9w4UVAz59d44oFzQn1xcQYSPc -ysVMyndrSG/jAqUP2hCeg8XZrETGSfh7IgunYmfcm6U3qJ79ZFpx1Cf18RZaT9Qt -ujKQHvQmzPVYfPH3h0eH7+Bgpp2Us5UrwS/ZHwo+iC4yLojZkvnw+FXpQ3ezR9j3 -w/W3RjCtzwgnm2C9rPW5oWziKEw2uEl+3Cx96OCeAjH5Sb1lvHh+DtLgJPAV5RoS -1uFva1nk2UbQF4dbB3x9rwePRfuTCL+bvzYjASPC56WIGA9zWPo= -=s7cp ------END PGP SIGNATURE----- diff --git a/kmahjongg-24.01.95.tar.xz b/kmahjongg-24.01.95.tar.xz new file mode 100644 index 0000000..a212037 --- /dev/null +++ b/kmahjongg-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75b51da0994b31aa6a1e1da52d7530c0a6247a9a0104dd6e05de26a428c8a77a +size 4100328 diff --git a/kmahjongg-24.01.95.tar.xz.sig b/kmahjongg-24.01.95.tar.xz.sig new file mode 100644 index 0000000..5702722 --- /dev/null +++ b/kmahjongg-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44oYACgkQOmpNuDnq +ptdp2A//Y/7+lMXNpkr4tLmSzdTS1QXUbLv0riMpV3AW10kclkE1Z2256u5UL6wn +rVkhxn373l3lKJVIjMxxix9/Jc0aY8PW601UXWRlOt10/uynRNkrjzC65pfISVKy +daAc2SU7hbaOBGEf2VAuPkxal9SYwutyQALzeYw2tucpE4dvbt5EQz9ibR0Kd98g +znOZTsuxuipl3ypgiVA2dlPXPnNmUm+mGZDVtETy3WAm/HROe2NdwssxjQPK4XYM +HNMCO4GV3hXJjYzQjxUL6dJLisyKZZZTezpEk17TQyyrVSuKyJF5XeePcQkVHbVE +JS4rufzG4EX1wrqVI6uppy8w3Dshv85e9iS7y5maegK//SGn8j1XoqfFVaqJNPtb +zSqSv2Q4eZZ+dxbZqhFt+VTJ9Lgv3St7xn5rFZeM4x1I9zT3iPsPbfmZ+mkks+5W +Y3h61TGldVg5/PTRUw10YZG0u1oNGN7uoLclVcgUGkzBYUDCi2IPntZcKb/1gCwD +Eo+YssezuZP6gC3egm7k72IwXjeyO9VsbNTHFSpHLZR3KFZkdEXwzd823spZyM7Y +q7pldpNNmo/NxNG8h2W0ZPux8OtUBLa6x5jSzGZdZMGpmPQr4137l9K+2RgQYe5p +eNCqGOhwI+CmP02FGYkzbnUBnYVvzB6Fj9y9EvV8SzK4EhqGyHE= +=dWYm +-----END PGP SIGNATURE----- diff --git a/kmahjongg.changes b/kmahjongg.changes index d5625df..dfbff88 100644 --- a/kmahjongg.changes +++ b/kmahjongg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:45 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:49 UTC 2023 - Christophe Marin diff --git a/kmahjongg.spec b/kmahjongg.spec index 7605ce1..a0c97f3 100644 --- a/kmahjongg.spec +++ b/kmahjongg.spec @@ -1,7 +1,7 @@ # # spec file for package kmahjongg # -# 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,34 +16,35 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kmahjongg -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Mahjongg game License: GPL-2.0-or-later URL: https://apps.kde.org/kmahjongg -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 -BuildRequires: extra-cmake-modules -BuildRequires: update-desktop-files -BuildRequires: xz -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5Crash) -BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5Declarative) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KMahjongglib) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Svg) +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KDEGames6) +BuildRequires: cmake(KF6Completion) >= %{kf6_version} +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6Crash) >= %{kf6_version} +BuildRequires: cmake(KF6DBusAddons) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6NewStuff) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(KMahjongglib6) >= 5.1.0 +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} Obsoletes: kmahjongg5 < %{version} Provides: kmahjongg5 = %{version} @@ -55,31 +56,30 @@ by removing pieces of the same type. %lang_package %prep -%autosetup -p1 -n kmahjongg-%{version} +%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 -%{kf5_find_htmldocs} - -%suse_update_desktop_file -r org.kde.kmahjongg Game BoardGame +%find_lang %{name} --with-html --all-name %files %license LICENSES/* -%doc %lang(en) %{_kf5_htmldir}/en/kmahjongg/ -%{_kf5_applicationsdir}/org.kde.kmahjongg.desktop -%{_kf5_appstreamdir}/org.kde.kmahjongg.appdata.xml -%{_kf5_bindir}/kmahjongg -%{_kf5_configkcfgdir}/ -%{_kf5_debugdir}/kmahjongg.categories -%{_kf5_iconsdir}/hicolor/*/apps/kmahjongg.* -%{_kf5_sharedir}/kmahjongg/ +%doc %lang(en) %{_kf6_htmldir}/en/kmahjongg/ +%{_kf6_applicationsdir}/org.kde.kmahjongg.desktop +%{_kf6_appstreamdir}/org.kde.kmahjongg.appdata.xml +%{_kf6_bindir}/kmahjongg +%{_kf6_configkcfgdir}/kmahjongg.kcfg +%{_kf6_debugdir}/kmahjongg.categories +%{_kf6_iconsdir}/hicolor/*/apps/kmahjongg.* +%{_kf6_sharedir}/kmahjongg/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kmahjongg/ %changelog