[rpms/kommit] epel10: Migrate to KF6

[rpms/kommit] epel10: Migrate to KF6

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/kommit
            Branch : epel10
            Commit : 2134673558794ab750a9680445c57f5dac22be28
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-04-04T17:52:03-04:00
            Stats  : +27/-21 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/kommit/c/2134673558794ab750a9680445c57f5dac22be28?branch=epel10

            Log:
            Migrate to KF6

Dolphin, along with most of the rest of KDE, moved to Qt6/KF6 in F40.
Since kommit provides a dolphin plugin, it needs to do so as well.

Fixes: rhbz#2251937
Fixes: rhbz#2261286

---
diff --git a/kommit.spec b/kommit.spec
index 74bee04..4d7d3dd 100644
--- a/kommit.spec
+++ b/kommit.spec
@@ -1,6 +1,6 @@
 Name:           kommit
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical Git Client
 
 License:        GPL-3.0-or-later AND GPL-2.0-or-later AND BSD-3-Clause
@@ -12,22 +12,26 @@ BuildRequires:  cmake
 BuildRequires:  extra-cmake-modules
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
-BuildRequires:  qt5-qtbase-devel
-BuildRequires:  kf5-kconfigwidgets-devel
-BuildRequires:  kf5-kcoreaddons-devel
-BuildRequires:  kf5-kcrash-devel
-BuildRequires:  kf5-kdbusaddons-devel
-BuildRequires:  kf5-kdoctools-devel
-BuildRequires:  kf5-ki18n-devel
-BuildRequires:  kf5-kxmlgui-devel
-BuildRequires:  kf5-kio-devel
-BuildRequires:  kf5-ktextwidgets-devel
-BuildRequires:  kf5-ktexteditor-devel
-BuildRequires:  kf5-syntax-highlighting-devel
 BuildRequires:  pkgconfig(libgit2)
+BuildRequires:  cmake(Qt6Core)
+BuildRequires:  cmake(Qt6Gui)
+BuildRequires:  cmake(Qt6Widgets)
+BuildRequires:  cmake(Qt6Concurrent)
+BuildRequires:  cmake(Qt6Core5Compat)
+BuildRequires:  cmake(KF6ConfigWidgets)
+BuildRequires:  cmake(KF6CoreAddons)
+BuildRequires:  cmake(KF6Crash)
+BuildRequires:  cmake(KF6DBusAddons)
+BuildRequires:  cmake(KF6DocTools)
+BuildRequires:  cmake(KF6I18n)
+BuildRequires:  cmake(KF6XmlGui)
+BuildRequires:  cmake(KF6KIO)
+BuildRequires:  cmake(KF6TextWidgets)
+BuildRequires:  cmake(KF6TextEditor)
+BuildRequires:  cmake(KF6SyntaxHighlighting)
 BuildRequires:  cmake(DolphinVcs)
 
-Requires:       kf5-filesystem
+Requires:       kf6-filesystem
 Requires:       hicolor-icon-theme
 
 Provides:       gitklient = %{version}-%{release}
@@ -41,18 +45,18 @@ Obsoletes:      gitklient < 1.0
 
 
 %build
-%cmake_kf5
+%cmake_kf6 -DQT_MAJOR_VERSION=6
 %cmake_build
 
 
 %install
 %cmake_install
-%find_lang %{name}
+%find_lang %{name} --with-html
 
 
 %check
 desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
-appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml
 
 
 %files -f %{name}.lang
@@ -61,23 +65,25 @@ appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{
 %{_bindir}/%{name}
 %{_bindir}/%{name}diff
 %{_bindir}/%{name}merge
-%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
+%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml
 %{_libdir}/lib%{name}.so.0
 %{_libdir}/lib%{name}.so.1.3.0
 %{_libdir}/lib%{name}diff.so.0
 %{_libdir}/lib%{name}diff.so.1.3.0
 %{_libdir}/lib%{name}gui.so.0
 %{_libdir}/lib%{name}gui.so.1.3.0
-%{_qt5_plugindir}/dolphin/vcs/%{name}dolphinplugin.so
+%{_kf6_qtplugindir}/dolphin/vcs/%{name}dolphinplugin.so
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/actions/*.svg
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/qlogging-categories5/kommit.categories
-%{_defaultdocdir}/HTML/en/%{name}
+%{_datadir}/qlogging-categories6/kommit.categories
 
 
 %changelog
+* Thu Apr 04 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-5
+- Migrate to KF6
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild