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/kajongg-23.08.4.tar.xz b/kajongg-23.08.4.tar.xz deleted file mode 100644 index 32ded18..0000000 --- a/kajongg-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75c9524c23d742906a0d3551f11ec2b6ff176c75ad24f6df68b2596d5382905a -size 4592152 diff --git a/kajongg-23.08.4.tar.xz.sig b/kajongg-23.08.4.tar.xz.sig deleted file mode 100644 index 85ef2e2..0000000 --- a/kajongg-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu70YACgkQu0YzUNbv -Me+orA/+LqascH21lRt5JeSFh5qTf6aF5xYOFKzSCW4p5gKwDzNUzlF3vpkx2x3T -7UluODKu5+TeKi3RtHj+rEHVpzhLSgIFd4KfmyBwUn+y462xWyE/Mk9xwsdnyFVo -Mvu63WrUZtKD2XrHKcP3Gy9LN2TKhwa+5A8XfXp1/nZGgUPoaRB497WrazW3RRRs -ckvh2dd9Theukm3jL0uWcoy+y9ZUPvU3NEZOv6GKl/f/rDb19OVMb+ht0kVoPvmz -dXXzbtllKQ6te8xfINZfir2kI1nCbpKfIFt3sfes3tTwEsNTFkshedGIzka2xAAw -UUOYBG2aLNDD4Nl3bLFWFU7HZjilD6LlZi7WGTT46r1rgjqQw529H+x+7UtVuGHY -05Zb4fca2U3UPIGsVekSTVpuk1EsSIleKTDv08NqId9kT2S2V/S981xSQtYAIT4y -VCcyWBds8TrusXg2M4fprPZ+e9CQuiC/W3VNAQVrFWcPtTg80hfuWQWwOBWVyOMA -ojpohUm1NVGlITe+gogY8It1wdK7dSku0KZFYvG2oEQ2RsV+QrpFpBcS8mOkhQtE -mdfoYh+lm4LuqqGAfm1PxZEmoQ2raKVd2736gV4kreMRpuqvBWkl88aBFL54/n4b -FSNHbWno4yYWCCV0EPBObTDNk3J51pNkPfUTuGIf0FvM05+51AM= -=e5Qd ------END PGP SIGNATURE----- diff --git a/kajongg-24.01.95.tar.xz b/kajongg-24.01.95.tar.xz new file mode 100644 index 0000000..15c5f38 --- /dev/null +++ b/kajongg-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18c28d05514b838df6fa9c5050dae84dc78ff746720b68addd26f994a518fee4 +size 4591248 diff --git a/kajongg-24.01.95.tar.xz.sig b/kajongg-24.01.95.tar.xz.sig new file mode 100644 index 0000000..a28d249 --- /dev/null +++ b/kajongg-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44kkACgkQOmpNuDnq +ptef/Q//ZcYiPy3zUxShfyKgNOrurC1ITf2s/mWJ8PLAKufeetkXdlDzXUsInP2H +di4/RMTNnG1oUOPNqsGTxdJZLHDNoARoyfOVl9y3TjmKQOlgSymozOMR/Fnbteeh +5tmRnKnLqwrZQEhRzPMJ4w8JS/7jt00EoMDuEnYuFfVaFPfAzTU3iYIvCWWKQjKx +vHRti7zWZYlIOQ2B9QgpmitrhIYAR02Cd1WBBMsp3wZsKQOxovDn+Hpu1MBVEa9r +j6E+dOEa2CU9SS5Z3MdikXK8VLKI+iVDnyy3hJ6Z9GjEYaK8NxaF4ddRqmyo/g/f +spqoZZ/ZbaAGvwhvzguCqt7EhX0xuSDLjeb3NJVvcbUTR0KKloX3jcq9HF6+HTxn +Q7MWj1y46j1h7W6HvFMrzRVA4ROZTO0lh8e9cJMz4Kb1bjOyRE6eoPTaX/ZrSIRz +L7xTxK5SUhtMR6Ci02vrcioTpqPB0gS2J7/FJLXqS/vBbqtD4gWNuLEn9JouIzec +sgMoKHJjCMPr14QxmVCEIacf5MILe7D13++heXDwf7/8Ve3qMG5yZPLrzM04HRDu +ZC1SSkQ8GFBlcIyYGB3X9P1suqwF76GIqulzOd1aYSEhhsIvBOT3gAUcnyuxYmjx +KKS3F6SBWKJ7yiM1n1sRP7gxk7Z29MWOagBokBTydyUNWU46QIQ= +=mKWV +-----END PGP SIGNATURE----- diff --git a/kajongg.changes b/kajongg.changes index 4b52233..5218820 100644 --- a/kajongg.changes +++ b/kajongg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:07:40 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:10 UTC 2023 - Christophe Marin diff --git a/kajongg.spec b/kajongg.spec index d66065f..dd59231 100644 --- a/kajongg.spec +++ b/kajongg.spec @@ -1,7 +1,7 @@ # # spec file for package kajongg # -# 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,35 +16,42 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + +%{?sle15_python_module_pythons} +%if 0%{?suse_version} > 1500 +%define pyver python3 +%else +%define pyver python311 +%endif + %bcond_without released Name: kajongg -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: 4 Player Mahjongg game License: GPL-2.0-or-later URL: https://apps.kde.org/kajongg -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: python3-Twisted >= 16.6.0 -BuildRequires: python3-base >= 3.5.0 -BuildRequires: python3-qt5-devel -BuildRequires: update-desktop-files -BuildRequires: xz -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KMahjongglib) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Widgets) -Requires: python3-Twisted -Requires: python3-qt5 +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: %{pyver}-Twisted >= 16.6.0 +BuildRequires: %{pyver}-base >= 3.8.0 +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6DocTools) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KMahjongglib6) +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Svg) >= %{qt6_version} +BuildRequires: cmake(Qt6SvgWidgets) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Requires: %{pyver}-Twisted +Requires: %{pyver}-PyQt6 BuildArch: noarch %description @@ -56,32 +63,28 @@ Kajongg is a version of the four player Mahjongg tile game. %autosetup -p1 -n kajongg-%{version} %build -# Workaround for kde#376303 -export PYTHONDONTWRITEBYTECODE=1 -export DESTDIR=%{buildroot} -%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.kajongg Game BoardGame +%find_lang %{name} --with-html --all-name %files %license COPYING* %doc README -%doc %lang(en) %{_kf5_htmldir}/en/kajongg/ -%{_kf5_applicationsdir}/org.kde.kajongg.desktop -%{_kf5_appsdir}/kajongg/ -%{_kf5_appstreamdir}/org.kde.kajongg.appdata.xml -%{_kf5_bindir}/kajongg -%{_kf5_bindir}/kajonggserver -%{_kf5_iconsdir}/hicolor/*/actions/games-kajongg-law.* -%{_kf5_iconsdir}/hicolor/*/apps/kajongg.* +%doc %lang(en) %{_kf6_htmldir}/en/kajongg/ +%{_kf6_applicationsdir}/org.kde.kajongg.desktop +%{_kf6_sharedir}/kajongg/ +%{_kf6_appstreamdir}/org.kde.kajongg.appdata.xml +%{_kf6_bindir}/kajongg +%{_kf6_bindir}/kajonggserver +%{_kf6_iconsdir}/hicolor/*/actions/games-kajongg-law.* +%{_kf6_iconsdir}/hicolor/*/apps/kajongg.* %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kajongg/ %changelog