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/kjournald-23.08.4.tar.xz b/kjournald-23.08.4.tar.xz deleted file mode 100644 index fdb2a83..0000000 --- a/kjournald-23.08.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f43f1da9f885422e7f8bd8b65bf61affc68a2665e409be1fdc63ceeb7dd92f2c -size 515432 diff --git a/kjournald-23.08.4.tar.xz.sig b/kjournald-23.08.4.tar.xz.sig deleted file mode 100644 index a605d66..0000000 --- a/kjournald-23.08.4.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu8YEACgkQu0YzUNbv -Me/IXg//W7v9UYN6MAFMOfOPcW5hMwI+IFlzWbBLTSPPasgoez9o5Y2OMMOJE8h8 -NJ2+QUd9+cvqyozmOaWkw56mKnQDkbwxFJB7q5tXkLvgWZLumV6hFlu5Oa0n+n6/ -kaBNWA5Kz8v80YaCU4bkp/ODNKh9XI+HKfXImBX7WtPaiS7RHxBxgQiOIntnmvNy -ji5lcxGFpBEC0Y13dIZRNB0p9aybzJQn6+7CneQzz+RNq6cBwpZGyew+9zf6WOor -fqfJVW9oYU0axn84+anRvxxDXfpUdS5141MhkNPY1pEVovac3/PbsC2ewCcwc94Q -40vs2emDipPRYzRFE3FhvAZxa/Y3tfeWAft8LIg+w7Iqr2l5SW3ej77oURw1Ytq3 -9aALLw/3wyf5w6FzXBDM+fK4pC9OJLvg7PDAKLDJQeYeHpLF3/rqlalDUgxoWSja -lAa8TgaqpohHSkKVYJyc5kK03kiORaBxIl8rO2FiVzT9Y9h4dmEf+elM1LzoJwsn -z+uR1+LlipcSSKZOCR2N8mjQDIYYJ6Q77P6bApHLq1d0tMYhb1JIeuHBBHZdV8lF -I/3hqzgeAEf2ryP4XyHuhKcNBR5g4cJurXADlTHSabnyE0/u2jTAd6fioc0l9chS -VunnQPL0Ay7L/d/XC4lbYSt5cZ4KJy3oR2BnVaDce9kGnGQaqi8= -=BV92 ------END PGP SIGNATURE----- diff --git a/kjournald-24.01.95.tar.xz b/kjournald-24.01.95.tar.xz new file mode 100644 index 0000000..5d5a33a --- /dev/null +++ b/kjournald-24.01.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd705ebe9a9c92eb877a915492515f850ebcfd15c1405350c13ee7a1ee6b556c +size 516128 diff --git a/kjournald-24.01.95.tar.xz.sig b/kjournald-24.01.95.tar.xz.sig new file mode 100644 index 0000000..4e875d2 --- /dev/null +++ b/kjournald-24.01.95.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmW45KwACgkQOmpNuDnq +pte3Vw//apO9St201tPWOi5nE1jYLNsF9vzf8OpK+l41TdUWHFch8xAhT2wVUDn2 +DVQs2htQpo/tsfST40NeyVi5IXbNnrrzgOhFEQ1LEJLNCyD+7tNZDX+QovYnIdaB +5wTewWY8nL+Pso7bw/PsK595h2Wwzy+hmlmJb1KRMfnP5Iscca9KeNONVBYc+R6U ++YSTL3H31n4ngZAcK1OP1KdinruTW2wJjbv9+CbemtROuwfxy+D1WpTsgo2vPXm3 +ZaVHt0+IHEbBiWPmP3iMI3LIZ47nn2aCKLWq4yLMpPIEu9b54fVlZsGGzd5tChNg +p4HCGMTJs6HFPjfcYZnppUyy4nNaBYALMfmyhbqmhmMUSn/23bFUrqpJuSLqrFVr ++OJyHpUJ+lcO65AoRQmYRb/AMBBOMxQuigZ/uXiLD3GoS9S3EWZk5wBUDQIaV5a4 +HLDv6Vxz8N1nV+vvovs/f8qzHT9E8HOofzg9+dkGYv/aumRNZSJatContRShF0ap +gI6zdfrCs4BcFHpfd62S3cAo5lCJotzIBP/WAli60q4Q+Tr+FSRSLMJ1sfhXrQJL ++52GQOm9/9Mv4UChUZ0gnAfxHkuptfWsE1quwIczz52hwBiNsMqy4X0lkI6Qg4wR +/0efvu9Frky1J7cEGc+hCpuQI2GhugYnfb4iQWOWiTRHGlv209A= +=VtiA +-----END PGP SIGNATURE----- diff --git a/kjournald.changes b/kjournald.changes index 893c04c..6b07399 100644 --- a/kjournald.changes +++ b/kjournald.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 9 16:08:38 UTC 2024 - Christophe Marin + +- Update to 24.01.95 + * https://kde.org/announcements/megarelease/6/rc2/ + ------------------------------------------------------------------- Tue Dec 5 14:19:45 UTC 2023 - Christophe Marin diff --git a/kjournald.spec b/kjournald.spec index 5429e6f..955b86e 100644 --- a/kjournald.spec +++ b/kjournald.spec @@ -1,7 +1,7 @@ # # spec file for package kjournald # -# 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 @@ -17,28 +17,33 @@ %define soname 0 +%define kf6_version 5.246.0 +%define qt6_version 6.6.0 + %bcond_without released Name: kjournald -Version: 23.08.4 +Version: 24.01.95 Release: 0 Summary: Qt browser for journald database License: LGPL-2.1-or-later URL: https://invent.kde.org/system/kjournald -Source0: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source0: 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: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: fdupes BuildRequires: pkgconfig -BuildRequires: update-desktop-files -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickControls2) +BuildRequires: cmake(KF6CoreAddons) >= %{kf6_version} +BuildRequires: cmake(KF6I18n) >= %{kf6_version} +BuildRequires: cmake(Qt6Core) >= %{qt6_version} +BuildRequires: cmake(Qt6Quick) >= %{qt6_version} +BuildRequires: cmake(Qt6QuickControls2) >= %{qt6_version} +BuildRequires: cmake(Qt6Test) >= %{qt6_version} +BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} BuildRequires: pkgconfig(libsystemd) -Requires: libqt5-qtquickcontrols2 +Requires: qt6-declarative-imports >= %{qt6_version} %description This project aims to provide an abstraction of the systemd’s journald API in @@ -55,16 +60,14 @@ reuseable library and application logic. %autosetup -p1 %build -%cmake_kf5 -d build +%cmake_kf6 -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install -rm %{buildroot}%{_libdir}/lib%{name}.so - -%suse_update_desktop_file -i org.kde.kjournaldbrowser Utility +rm %{buildroot}%{_libdir}/libkjournald.so %find_lang %{name} --all-name @@ -74,11 +77,11 @@ rm %{buildroot}%{_libdir}/lib%{name}.so %files %license LICENSES/* -%{_kf5_applicationsdir}/org.kde.kjournaldbrowser.desktop -%{_kf5_appstreamdir}/org.kde.kjournaldbrowser.appdata.xml -%{_kf5_bindir}/kjournaldbrowser -%{_kf5_debugdir}/kjournald.* -%{_kf5_libdir}/libkjournald.so.* +%{_kf6_applicationsdir}/org.kde.kjournaldbrowser.desktop +%{_kf6_appstreamdir}/org.kde.kjournaldbrowser.appdata.xml +%{_kf6_bindir}/kjournaldbrowser +%{_kf6_debugdir}/kjournald.categories +%{_kf6_libdir}/libkjournald.so.* %files lang -f %{name}.lang