diff --git a/.gitignore b/.gitignore index 220b7f9..6a10499 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /yakuake-23.08.0.tar.xz /yakuake-23.08.1.tar.xz /yakuake-23.08.2.tar.xz +/yakuake-24.01.75.tar.xz diff --git a/sources b/sources index bef7e0c..5af67e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yakuake-23.08.2.tar.xz) = b1481958713cfb474ba5e360f23020069154aada7474133f5fc3076e3bea0d84de683b1fa7e463170d7f71a38f2a08a6ff67528aaa273ced3620c7681fd56d1c +SHA512 (yakuake-24.01.75.tar.xz) = 283811a84c361cc51e515670f62816c4605eecadba08a18d3521115332404ec8ee64e1cc2030934f1403f1b45c3f5bef8d12ad06b060b8e71e6b2ac577949111 diff --git a/yakuake.spec b/yakuake.spec index 771cac8..2965c27 100644 --- a/yakuake.spec +++ b/yakuake.spec @@ -3,53 +3,48 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") Name: yakuake -Version: 23.08.2 +Version: 24.01.75 Release: 1%{?dist} Summary: A drop-down terminal emulator # KDE e.V. may determine that future GPL versions are accepted License: GLv2 or GPLv3 URL: https://kde.org/applications/system/org.kde.yakuake - -%global revision %(echo %{version} | cut -d. -f3) -%global majmin_ver %(echo %{version} | cut -d. -f1,2) -%if %{revision} >= 50 -%global stable unstable -%else -%global stable stable -%endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz ## upstream fixes # konsolepart -Requires: konsole5-part +Requires: konsole-part%{?_isa} >= %{version} BuildRequires: desktop-file-utils BuildRequires: extra-cmake-modules BuildRequires: gettext -BuildRequires: kf5-rpm-macros -BuildRequires: kf5-karchive-devel -BuildRequires: kf5-kconfig-devel -BuildRequires: kf5-kcoreaddons-devel -BuildRequires: kf5-kcrash-devel -BuildRequires: kf5-kdbusaddons-devel -BuildRequires: kf5-kglobalaccel-devel -BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kiconthemes-devel -BuildRequires: kf5-kio-devel -BuildRequires: kf5-knewstuff-devel -BuildRequires: kf5-knotifications-devel -BuildRequires: kf5-knotifyconfig-devel -BuildRequires: kf5-kparts-devel -BuildRequires: kf5-kwidgetsaddons-devel -BuildRequires: kf5-kwindowsystem-devel - -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5X11Extras) - -BuildRequires: cmake(KF5Wayland) +BuildRequires: kf6-rpm-macros + +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: qt6-qtbase-private-devel + +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6Config) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6Crash) +BuildRequires: cmake(KF6DBusAddons) +BuildRequires: cmake(KF6GlobalAccel) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6NewStuff) +BuildRequires: cmake(KF6Notifications) +BuildRequires: cmake(KF6NotifyConfig) +BuildRequires: cmake(KF6Parts) +BuildRequires: cmake(KF6WidgetsAddons) +BuildRequires: cmake(KF6WindowSystem) +BuildRequires: cmake(KF6StatusNotifierItem) +BuildRequires: cmake(KF6Wayland) %if 0%{?fedora} %global appstream_validate 1 @@ -65,7 +60,7 @@ Yakuake is a drop-down terminal emulator. %build -%cmake_kf5 +%cmake_kf6 %cmake_build @@ -78,25 +73,28 @@ Yakuake is a drop-down terminal emulator. %check %if 0%{?appstream_validate} -appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.yakuake.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.yakuake.appdata.xml %endif -desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.yakuake.desktop +desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.yakuake.desktop %files -f %{name}.lang %doc AUTHORS ChangeLog TODO %license LICENSES/* -%{_kf5_bindir}/yakuake -%{_kf5_datadir}/knsrcfiles/yakuake.knsrc -%{_kf5_metainfodir}/org.kde.yakuake.appdata.xml -%{_kf5_datadir}/applications/org.kde.yakuake.desktop -%{_kf5_datadir}/knotifications5/yakuake.notifyrc -%{_kf5_datadir}/yakuake/ -%{_kf5_datadir}/icons/hicolor/*/apps/yakuake.* -%{_kf5_datadir}/dbus-1/services/org.kde.yakuake.service +%{_kf6_bindir}/yakuake +%{_kf6_datadir}/knsrcfiles/yakuake.knsrc +%{_kf6_metainfodir}/org.kde.yakuake.appdata.xml +%{_kf6_datadir}/applications/org.kde.yakuake.desktop +%{_kf6_datadir}/knotifications6/yakuake.notifyrc +%{_kf6_datadir}/yakuake/ +%{_kf6_datadir}/icons/hicolor/*/apps/yakuake.* +%{_kf6_datadir}/dbus-1/services/org.kde.yakuake.service %changelog +* Mon Nov 27 2023 Yaakov Selkowitz - 24.01.75-1 +- 24.01.75 + * Thu Oct 12 2023 Marc Deop i Argemí - 23.08.2-1 - 23.08.2