diff --git a/.gitignore b/.gitignore index a692d52..46079b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/desktop-3.13.4.tar.gz +SOURCES/desktop-3.14.2.tar.gz diff --git a/.nextcloud-client.metadata b/.nextcloud-client.metadata index feecf65..a7e4d14 100644 --- a/.nextcloud-client.metadata +++ b/.nextcloud-client.metadata @@ -1 +1 @@ -c78cfa6d80a4066b0a144885edb3e328c201b708 SOURCES/desktop-3.13.4.tar.gz +4a998487a0327a7abe537e14c91b12507719d340 SOURCES/desktop-3.14.2.tar.gz diff --git a/SPECS/nextcloud-client.spec b/SPECS/nextcloud-client.spec index 7ac8646..f3d1aad 100644 --- a/SPECS/nextcloud-client.spec +++ b/SPECS/nextcloud-client.spec @@ -14,13 +14,12 @@ %endif Name: nextcloud-client -Version: 3.13.4 +Version: 3.14.2 Release: %autorelease.inferit 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: LGPL-2.1-or-later and GPL-2.0-only 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 @@ -47,28 +46,27 @@ BuildRequires: neon-devel BuildRequires: openssl-devel 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 %if 0%{?fedora} >= 40 || 0%{?rhel} > 9 BuildRequires: qt6-qtbase-devel -BuildRequires: kf6-kio-devel -BuildRequires: kf5-karchive-devel +BuildRequires: kf6-karchive-devel BuildRequires: kf6-kcoreaddons-devel BuildRequires: kf6-rpm-macros %else @@ -79,11 +77,6 @@ BuildRequires: kf5-rpm-macros %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 @@ -100,8 +93,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: LGPL-2.1-or-later Provides: mirall-common = %{version}-%{release} Obsoletes: mirall-common < 1.8.0 Requires: %{name}%{?_isa} = %{version}-%{release} @@ -113,8 +105,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: LGPL-2.1-or-later Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} @@ -181,7 +172,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 @@ -203,15 +194,6 @@ 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/