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/kollision-23.08.4.tar.xz b/kollision-23.08.4.tar.xz deleted file mode 100644 index 0b56899..0000000 --- a/kollision-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa0470a743357f66caaefc3d705fb539d93213328f3a55741fc780cc123294fb -size 308652 diff --git a/kollision-23.08.4.tar.xz.sig b/kollision-23.08.4.tar.xz.sig deleted file mode 100644 index a283ea7..0000000 --- a/kollision-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu74kACgkQu0YzUNbv -Me+XvA/9GlA4CZi8CAvIYmX7K5NGwvwS4tPgr0EDMrMLMFxdwcdb7i0mV5igt2uD -LDla8VXrLMceXyPbnNK7jmi+h7extRn5+xkn6JFNhqR2eAtD2KdL35b0Pm/iG5T7 -PzqN5gKf26j3h9s31+PQOy/5nnUVitSApVIVuaT9IB5IfpBghpVvpqkdDJemqfeB -YHo2bgTxJ1XvAGCsbIwFS0eAYLFnwt0miOcg012KgevjRsz5pPaROi2EZDdSooUJ -p4uyqpLsPjV513uLz3FKzAGjjUIzyeZmhOWgYLlA/a6M1xCjwy6Qgdo65WtTKwhi -X6PIaus3o6iT1uLcBWiIQ6ICzng/1Kom9OTUbbICcacWF8aRJ9jrE4qtzDpQgJ0v -2tvn0CO/XYYa0z/SbaogF8IF2sVsZ0P8eAXDuI+EhsI4WqJjl7GlUQOP0rqBSZkd -naLlA6XID/or4TbLG8tAEDqxcS9CRqfguDGpVeC87epHea2JA1QgfhVEzIEIPP5c -2H8ApKQLx8Lm+hAVCRzoV6iyv10SGLgjZoaiiB9bXOiGYv6qXnBK+I66NsDw6SOL -KFe8psJpWHalZakRZtOrf/ff+pns3FG66USZWMOyLsOT0XwICfrFGo+Yee0AZM6G -S2j2LkkxRZTA8AMGXAgsHfasTlQeej+5MsN4O4/kLdA3OtPt7So= -=tzq/ ------END PGP SIGNATURE----- diff --git a/kollision-24.01.95.tar.xz b/kollision-24.01.95.tar.xz new file mode 100644 index 0000000..0643f44 --- /dev/null +++ b/kollision-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3626b6b3bfae5ceaad222f5544d257004ebd7367446e197fec6b6c6e7064906 +size 307496 diff --git a/kollision-24.01.95.tar.xz.sig b/kollision-24.01.95.tar.xz.sig new file mode 100644 index 0000000..93cd545 --- /dev/null +++ b/kollision-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW44pgACgkQOmpNuDnq +ptdp4BAAgAI4zFZVXEISpDt7QSeC7UUah8Axzzhx5bxS2uob4zliWNBnmRcSnM69 +VNLqtlhrBTbQNPhIrE0WdiZr5YDtzx5uLJz+LiHHsGsyJ/vtgcvcaEa2WN6DXPGW +h4ntdBcrH6cSiXINqY0u85EbpP3JDFZ8Q1+xqS9mYhR4Y/A/h5Zu5TkDEZm5HxMb +NMxdNzgXV8NfKoqL6N+Xgpcjars2TMinEsCaIYJbnuPzcp2hRYQmD6tUGSOwFyhd +AyRzErFdfXViFkuc4wHBjHb6Bubuj1iUces3Tk68yRBqlWBbrEaj1JAfKQ8Q2Cpn +9vtdRWox5LtGt63RDO4yNiq6yVgQLli/NjeX9DGpxlIOsubunjOM8Jb8ixBs5hvn +uE9uIjRksWHNf9qD40jkY8lFL5kTo5AoCMMcZyF6AovAE1BnGoDFt4jzAQ8dHq/4 +W8I1wWJOPOqH342PAli6pf919XkS0sPOW+EKRctwhX9bL5FmCjg7zdBp+CRFkdnM +lKR1pdsBWsvf3qtCfaRDMZlIh5CWhmgnLfN11YRE+OksNoL/IRug73Aea5Tg4XmG +U8bkrC/M6ym4zllOk1aTEa67ErPzYv9v8dwcsAkQuLqn6GiEoH5aKNn7k7IuTE6V +lRBJRfKEO/151Z1uyxdc8G6ms4NRdlxF68qHgCy5/NoS8WGLTJo= +=94E7 +-----END PGP SIGNATURE----- diff --git a/kollision.changes b/kollision.changes index 0a842a7..f2cffa0 100644 --- a/kollision.changes +++ b/kollision.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:59 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:57 UTC 2023 - Christophe Marin diff --git a/kollision.spec b/kollision.spec index 05afabc..fa1258f 100644 --- a/kollision.spec +++ b/kollision.spec @@ -1,7 +1,7 @@ # # spec file for package kollision # -# 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,42 +16,34 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kollision -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Kollision game License: GPL-2.0-or-later URL: https://apps.kde.org/kollision -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: cmake(KF5Config) -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5DocTools) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5KDEGames) -BuildRequires: cmake(KF5KDELibs4Support) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5NewStuff) -BuildRequires: cmake(KF5NotifyConfig) -BuildRequires: cmake(KF5WidgetsAddons) -BuildRequires: cmake(KF5XmlGui) -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: cmake(Qt5QuickWidgets) -BuildRequires: cmake(Qt5Svg) -BuildRequires: cmake(Qt5Test) -BuildRequires: cmake(Qt5Widgets) -Obsoletes: %{name}5 < %{version} -Provides: %{name}5 = %{version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} +BuildRequires: cmake(KDEGames6) +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(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6WidgetsAddons) >= %{kf6_version} +BuildRequires: cmake(KF6XmlGui) >= %{kf6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} +Obsoletes: kollision5 < %{version} +Provides: kollision5 = %{version} %description KDE version of a classic arcade game @@ -62,27 +54,26 @@ KDE version of a classic arcade game %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.kollision Game LogicGame +%find_lang %{name} --with-man --with-html --all-name %files %license LICENSES/* -%doc %lang(en) %{_kf5_htmldir}/en/kollision/ -%{_kf5_applicationsdir}/org.kde.kollision.desktop -%{_kf5_appsdir}/kollision/ -%{_kf5_appstreamdir}/org.kde.kollision.appdata.xml -%{_kf5_bindir}/kollision -%{_kf5_iconsdir}/hicolor/*/*/kollision.* -%{_kf5_iconsdir}/oxygen/*/*/kollision.* +%doc %lang(en) %{_kf6_htmldir}/en/kollision/ +%{_kf6_applicationsdir}/org.kde.kollision.desktop +%{_kf6_appstreamdir}/org.kde.kollision.appdata.xml +%{_kf6_bindir}/kollision +%{_kf6_iconsdir}/hicolor/*/*/kollision.* +%{_kf6_iconsdir}/oxygen/ +%{_kf6_sharedir}/kollision/ %files lang -f %{name}.lang +%exclude %{_kf6_htmldir}/en/kollision/ %changelog