Merge branch 'rawhide' into f40

nextcloud-client.spec

@@ -55,10 +55,11 @@ BuildRequires:  extra-cmake-modules
 BuildRequires:  inkscape
 # Plasma 5 Dolphin integration
 %if 0%{?fedora} >= 24 || 0%{?rhel} > 7
-BuildRequires:  kf5-kio-devel
+BuildRequires:  qt6-qtbase-devel
+BuildRequires:  kf6-kio-devel
 BuildRequires:  kf5-karchive-devel
-BuildRequires:  kf5-kcoreaddons-devel
-BuildRequires:  kf5-rpm-macros
+BuildRequires:  kf6-kcoreaddons-devel
+BuildRequires:  kf6-rpm-macros
 %endif
 BuildRequires:  sqlite-devel
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
@@ -172,6 +173,11 @@ sed -i 's/-fPIE/-fPIC/g' src/cmd/CMakeLists.txt
 %install
 %cmake_install
 
+# move dolphin plugins to kf5_plugindir
+mkdir -p %{buildroot}%{_kf6_plugindir}
+mv -v %{buildroot}%{_qt5_plugindir}/kf6/kfileitemaction %{buildroot}/%{_kf6_plugindir}
+mv -v %{buildroot}%{_qt5_plugindir}/kf6/overlayicon/ %{buildroot}/%{_kf6_plugindir}
+
 %find_lang client --with-qt
 mkdir -p %{buildroot}%{_datadir}/metainfo/
 install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/com.nextcloud.desktopclient.nextcloud.metainfo.xml
@@ -251,8 +257,8 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/com.nextc
 %if 0%{?fedora} || 0%{?rhel} > 7
 %files dolphin
 %{_libdir}/libnextclouddolphinpluginhelper.so
-%{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so
-%{_kf5_plugindir}/kfileitemaction/nextclouddolphinactionplugin.so
+%{_kf6_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so
+%{_kf6_plugindir}/kfileitemaction/nextclouddolphinactionplugin.so
 %endif
 
 %changelog