From 5c2144464691ce399cd8f076e1b13650f1fa11e5 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 13 Jul 2024 16:14:07 -0500 Subject: [PATCH 1/3] update to v3.13.2 --- .gitignore | 1 + nextcloud-client.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd3a81f..452cec1 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /desktop-3.12.5.tar.gz /desktop-3.13.0.tar.gz /desktop-3.13.1.tar.gz +/desktop-3.13.2.tar.gz diff --git a/nextcloud-client.spec b/nextcloud-client.spec index 909a964..2bb3415 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -4,7 +4,7 @@ %endif Name: nextcloud-client -Version: 3.13.1 +Version: 3.13.2 Release: %autorelease Summary: The Nextcloud Client diff --git a/sources b/sources index 62faa8e..8673c8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-3.13.1.tar.gz) = c78b3ed0a72a7e82028f62529fe00cdd387932d396a402fd3760a8a52bc6083a4b833ca28aea3b35637065de0fe6ca6a4f12c31fbf4b2a560d9001696194ae0b +SHA512 (desktop-3.13.2.tar.gz) = 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6 From 1de5f43c278144f9d44658f7a9318f7099588c2a Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 17 Aug 2024 15:43:06 -0500 Subject: [PATCH 3/3] Build nextcloud client with kf6 dolphin support; fixes bz#2299950 --- nextcloud-client.spec | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nextcloud-client.spec b/nextcloud-client.spec index 2bb3415..9adfe5f 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -56,10 +56,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} @@ -173,6 +174,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 @@ -252,8 +258,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