From 4a5f803d486b74d44aa516a01832873f4f531cb3 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 21 Sep 2024 11:05:53 -0500 Subject: [PATCH] Update to v3.14.0; move all dependencies to QT6; spec cleanup:drop old conditionals --- .gitignore | 1 + nextcloud-client.spec | 70 ++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 28 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index e2c1d69..cf93a03 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /desktop-3.13.1.tar.gz /desktop-3.13.2.tar.gz /desktop-3.13.4.tar.gz +/desktop-3.14.0.tar.gz diff --git a/nextcloud-client.spec b/nextcloud-client.spec index e652fdf..4e21f89 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -4,13 +4,12 @@ %endif Name: nextcloud-client -Version: 3.13.4 +Version: 3.14.0 Release: %autorelease Summary: The Nextcloud Client # -libs are LGPLv2+, rest GPLv2 -# Automatically converted from old format: LGPLv2+ and GPLv2 - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ AND GPL-2.0-only +License: LGPLv2+ and GPLv2 Url: https://nextcloud.com/install/#install-clients Source0: https://github.com/nextcloud/desktop/archive/v%{version}/desktop-%{version}.tar.gz Source1: com.nextcloud.desktopclient.nextcloud.metainfo.xml @@ -38,38 +37,36 @@ BuildRequires: openssl-devel BuildRequires: openssl-devel-engine BuildRequires: pkgconfig(dbus-1) BuildRequires: python3-sphinx -BuildRequires: qtlockedfile-qt5-devel -BuildRequires: qtkeychain-qt5-devel -BuildRequires: qtsingleapplication-qt5-devel -BuildRequires: qt5-qtbase -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtbase-private-devel -BuildRequires: qt5-qtbase-gui -BuildRequires: qt5-qtwebkit-devel -BuildRequires: qt5-qtxmlpatterns-devel -BuildRequires: qt5-qttools -BuildRequires: qt5-qttools-devel -BuildRequires: qt5-qtquickcontrols2-devel -BuildRequires: qt5-qtwebengine-devel -BuildRequires: qt5-qtwebsockets-devel -BuildRequires: qt5-qtsvg-devel +BuildRequires: qtlockedfile-qt6-devel +BuildRequires: qtkeychain-qt6-devel +BuildRequires: qtsingleapplication-qt6-devel +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-qtbase-gui +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qttools +BuildRequires: qt6-qttools-devel +BuildRequires: qt6-qtscxml-devel +BuildRequires: qt6-qtquickcontrols2-devel +BuildRequires: qt6-qtwebengine-devel +BuildRequires: qt6-qtwebsockets-devel +BuildRequires: qt6-qtsvg-devel +BuildRequires: qt6-qt5compat-devel BuildRequires: extra-cmake-modules BuildRequires: inkscape -# Plasma 5 Dolphin integration +BuildRequires: kf6-kio-devel +BuildRequires: kf6-kbookmarks-devel + +# Dolphin integration %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 BuildRequires: qt6-qtbase-devel -BuildRequires: kf6-kio-devel -BuildRequires: kf5-karchive-devel +BuildRequires: kf6-karchive-devel BuildRequires: kf6-kcoreaddons-devel BuildRequires: kf6-rpm-macros +BuildRequires: kf6-kguiaddons-devel %endif BuildRequires: sqlite-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%if 0%{?fedora} && 0%{?fedora} < 33 -# concerning libgnome-keyring read https://bugzilla.redhat.com/show_bug.cgi?id=1652973 -Requires: libgnome-keyring -%endif -Requires: qt5-qtquickcontrols Provides: mirall = %{version}-%{release} Obsoletes: mirall < 1.8.0 @@ -86,8 +83,7 @@ the directory and the Nextcloud Client does the rest. %package libs Summary: Common files for nextcloud-client -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPLv2+ Provides: mirall-common = %{version}-%{release} Obsoletes: mirall-common < 1.8.0 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -99,8 +95,7 @@ configuration file that determines the excluded files in a sync. %package devel Summary: Development files for nextcloud-client -# Automatically converted from old format: LGPLv2+ - review is highly recommended. -License: LicenseRef-Callaway-LGPLv2+ +License: LGPLv2+ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} @@ -167,7 +162,7 @@ sed -i 's/-fPIE/-fPIC/g' src/gui/CMakeLists.txt sed -i 's/-fPIE/-fPIC/g' src/cmd/CMakeLists.txt %build -%cmake_kf5 \ +%cmake_kf6 \ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ -DNO_SHIBBOLETH=1 \ -DBUILD_UPDATER=False @@ -177,25 +172,12 @@ 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 -# for distros that do not have KDE Plasma 5 -%if 0%{?fedora} < 24 && 0%{?rhel} <= 7 -rm -f %{buildroot}%{_libdir}/libnextclouddolphinpluginhelper.so -rm -f %{buildroot}%{_kf5_plugindir}/overlayicon/nextclouddolphinoverlayplugin.so -rm -f %{buildroot}%{_qt5_plugindir}/nextclouddolphinactionplugin.so -rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.desktop -%endif - - %if 0%{?rhel} # Only Fedora has Cinnamon, so there is no need for Nemo extension on EPEL rm -rf %{buildroot}%{_datadir}/nemo-python/ diff --git a/sources b/sources index 0cb5828..2598a5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-3.13.4.tar.gz) = f870508f024f1334813db55863e66866fee719c1e74f52d61338d321fc2ef65d2589f9211912956bd2251ea67802bc4425c63e6d25628c8a7117256297a1bb87 +SHA512 (desktop-3.14.0.tar.gz) = f4afdefbe35c5d22a042571ef352c6f7b99e35f2d968d09769e55f4de269b31a2df9c319dd844a938eb95bcff135667cbcd0ba168cbac7729c2d50f09ed18d2e