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/ktrip-23.08.4.tar.xz b/ktrip-23.08.4.tar.xz deleted file mode 100644 index 6d69d90..0000000 --- a/ktrip-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:af13dba80bcd1b8f930a786b4ce929788dece39a15175099d2171a0c310432b1 -size 254404 diff --git a/ktrip-23.08.4.tar.xz.sig b/ktrip-23.08.4.tar.xz.sig deleted file mode 100644 index a8b3387..0000000 --- a/ktrip-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8aYACgkQu0YzUNbv -Me8Hsw/7BIBoy72yZFHOwC74eE27Rb/uS3wSQgcoXPDni7CCegiLGyn14IG61dnC -wj2z2ik8Jg2xfynvH8gplrYHRSEMj81m0zEwdezrKhIIzwhhRW0AYqFkSylJ8+3H -sP8ekIy0rtp59/IBFzJwlOAGs0gHpTRr7YkSPZlDKfzOznl31z/ZXPf8800S2hkz -4Xz21PwxJRtgjUGpVS5svKweYffp1crfJEgP+cKNP2dDlSbvteNDN+3t/H8c9/pJ -4ERvswdRPPzlcehWxpD73ewN9qtvZ8tN7pSQo2Pl8uEPqRE0B8zvDXPaCr+OQtd4 -mCDvKKpzRi92idQZpcuZllkpFncBMGeAV0hgFSxMXmS9BAwnZMS6dHRlFrfI/+5/ -9MXj0COPaApSRW5DulF6dtK/abtssor0nYYHnLx1eGdK91AfBUG+0vZdnqpD2oBm -3I360OjdW7BsBDSE1PWMIK5RkEf7yss8eSn+5XrN0TRE74lf28xx0MQ8ZVoatQ0S -h8h1F79T5d/jVsfCLZ6i6jjvZLk/+T0QOKCqDb362+pWJUEyuslsFehZDdeoF4qA -4tTuv29M/6OReceIKWnCh/Qk6NR0Sp14mfACAivfd5ROTV/rko7sByUXeff1hsv5 -hRrKufRW9n2lyXVoFJCW9oQYG3kkf5jOAU/hQ873odlNbm/49q0= -=fDON ------END PGP SIGNATURE----- diff --git a/ktrip-24.02.0.tar.xz b/ktrip-24.02.0.tar.xz new file mode 100644 index 0000000..9ba790d --- /dev/null +++ b/ktrip-24.02.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44f26fe26f2bfa3342497051cb04bf34210aa7efed8615dac455bb4f39d7fbbb +size 255604 diff --git a/ktrip-24.02.0.tar.xz.sig b/ktrip-24.02.0.tar.xz.sig new file mode 100644 index 0000000..e1ea47c --- /dev/null +++ b/ktrip-24.02.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXVrygACgkQu0YzUNbv +Me999A/8Ds1tu+wopEATOSvgNVJFbLFz+SgRWmU9xLFupxhf1ok5t1vKrR9OTkyo +YMjfPh9s2tSZ7IEu7NHRlvUaMnr6gk6jRBrk3tM5Z9EtCIPeogvPBvxj03/Xm+NT +ADgP41kRfjaZAjeGmeAZL1XFrDHQdMKFqZbANbS26n2WjHFo07UaTGEzX5QxWpcl +oBUc+VD2ULsuWCRyMhINSD9s4ceMQnPLTx67xEy7jqVArY0yuPPPQv3Mrde5nKpY +hk7U2jIZMqGGykyA6k1hW8w9U2jyxgtUMORgCYiwCm3WA5KKAHeMnH7bhEjpM9Uf +h3AN/4VHXHU25w9yvJcUKbSvwaCRMNCpv25xEfnfR124ZLPS0TdjqFCFJawEBmTr +RcyL7HEzjwvaIrrCz21ZXxPZ9VwGMnNn6VeQRLrBsr6hpbxmNEuRKlXcsv425JhA +Nmk6lwBFQkRSV52RD0l6V/P2wlrtksizVZ32J6osOH5doe7fNrxulGlvlFJUkgem +2EGNtt+1VXPILwiExNaghZuo1t3Wyh0nbNlf2LyJgCbYEXXHBy3O2rfVVf845BRY +r74+uwKQETWJV7Q+Y5mi53UcZu4R6rn81wYQkRTbmN05lqegUeVy8NRLr4QyhQTK +U0VsI1ysoT6lGrViTdj1isOXe0bxB6FBOt9Pl96Ifl18u161zyw= +=9hoY +-----END PGP SIGNATURE----- diff --git a/ktrip.changes b/ktrip.changes index 3f77316..9f58597 100644 --- a/ktrip.changes +++ b/ktrip.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Feb 23 14:00:25 UTC 2024 - Christophe Marin + +- Update to 24.02.0 + * New feature release +- No code change since 24.01.95 + +------------------------------------------------------------------- +Fri Feb 9 16:09:32 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:20:17 UTC 2023 - Christophe Marin diff --git a/ktrip.spec b/ktrip.spec index fd4f45a..9a8e61e 100644 --- a/ktrip.spec +++ b/ktrip.spec @@ -1,7 +1,7 @@ # # spec file for package ktrip # -# 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,40 +16,44 @@ # +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: ktrip -Version: 23.08.4 +Version: 24.02.0 Release: 0 Summary: Public transport assistant targeted towards mobile Linux and Android License: GPL-2.0-or-later URL: https://apps.kde.org/ktrip -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: breeze5-icons -BuildRequires: extra-cmake-modules -BuildRequires: hicolor-icon-theme -BuildRequires: kf5-filesystem +BuildRequires: kf6-breeze-icons >= %{kf6_version} +BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Config) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5QQC2DesktopStyle) +BuildRequires: cmake(KF6Config) >= %{kf6_version} +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(KF6ItemModels) >= %{kf6_version} +BuildRequires: cmake(KF6QQC2DesktopStyle) >= %{kf6_version} +BuildRequires: cmake(KF6KirigamiAddons) >= 0.11.0 BuildRequires: cmake(KPublicTransport) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Qml) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickControls2) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Gui) >= %{qt6_version} +BuildRequires: cmake(Qt6Qml) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} # Breeze is used as the fallback icon theme -Requires: breeze5-icons +Requires: kf6-breeze-icons # QML imports +Requires: kf6-kitemmodels-imports >= %{kf6_version} +Requires: kirigami-addons6 >= 0.11.0 Requires: kpublictransport -Requires: kirigami2 +Requires: kf6-kirigami-imports >= %{kf6_version} %description KTrip is a public transport assistant targeted towards mobile Linux and @@ -62,11 +66,12 @@ transport providers by leveraging KPublicTransport. %autosetup -p1 %build -%cmake_kf5 -d build -%cmake_build +%cmake_kf6 + +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install %suse_update_desktop_file org.kde.ktrip Utility Maps @@ -75,10 +80,10 @@ transport providers by leveraging KPublicTransport. %files %license LICENSES/* %doc README.md -%{_kf5_bindir}/ktrip -%{_kf5_iconsdir}/hicolor/scalable/apps/org.kde.ktrip.svg -%{_kf5_applicationsdir}/org.kde.ktrip.desktop -%{_kf5_appstreamdir}/org.kde.ktrip.appdata.xml +%{_kf6_bindir}/ktrip +%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.ktrip.svg +%{_kf6_applicationsdir}/org.kde.ktrip.desktop +%{_kf6_appstreamdir}/org.kde.ktrip.appdata.xml %files lang -f %{name}.lang