From 24a35fe9f48c65edc6c1cc38764b0cb1db3ad1a3 Mon Sep 17 00:00:00 2001 From: Germano Massullo Date: Mon, 19 Nov 2018 14:50:35 +0100 Subject: [PATCH] 2.5.0 release --- .gitignore | 1 + nextcloud-client.spec | 47 ++++++++++++++++++------------------------- sources | 3 +-- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 93b3664..8f400ef 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /owncloudclient-2.4.0.tar.xz /client_theming-2.3.3.tar.gz /v2.3.3.tar.gz +/desktop-2.5.0.tar.gz diff --git a/nextcloud-client.spec b/nextcloud-client.spec index d06fad1..1516c56 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -1,20 +1,15 @@ -# This package depends on automagic byte compilation -# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2 -%global _python_bytecompile_extra 1 - %global _hardened_build 1 Name: nextcloud-client -Version: 2.4.0 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: The Nextcloud Client # -libs are LGPLv2+, rest GPLv2 License: LGPLv2+ and GPLv2 Url: https://nextcloud.com/install/#install-clients -Source0: https://github.com/nextcloud/client_theming/archive/v2.3.3.tar.gz -Source1: https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz -Source2: nextcloud.appdata.xml +Source0: https://github.com/nextcloud/desktop/archive/desktop-%{version}.tar.gz +Source1: nextcloud.appdata.xml # The patch does 3 things: # - Depends on system lib for QtSingleApplication and QtLockedFile # - Remove the extraneous namespace when calling QtSingleApplication @@ -22,7 +17,7 @@ Source2: nextcloud.appdata.xml # Application::slotParseMessage slot # These fix are needed because the system wide QtSingleApplication is slightly # different from the bundled one. -Patch0: %{name}-%{version}-syslibs.patch +#Patch0: %{name}-%{version}-syslibs.patch ## patch 1 solves https://bugzilla.redhat.com/show_bug.cgi?id=1409252 Patch1: %{name}-icon.patch @@ -30,6 +25,7 @@ BuildRequires: check BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: doxygen +BuildRequires: pkgconfig(gio-2.0) BuildRequires: libappstream-glib BuildRequires: neon-devel BuildRequires: openssl-devel @@ -43,6 +39,8 @@ BuildRequires: qt5-qtbase-gui BuildRequires: qt5-qtwebkit-devel BuildRequires: qt5-qtxmlpatterns-devel BuildRequires: qt5-qttools qt5-qttools-devel +BuildRequires: qt5-qtwebengine-devel +BuildRequires: qt5-qtsvg-devel BuildRequires: extra-cmake-modules # Plasma 5 Dolphin integration %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 @@ -133,24 +131,15 @@ The nextcloud desktop client dolphin extension. %endif %prep -# 2.3.2 Nextcloud theme not yet available -%setup -q -n client_theming-2.3.3 -%setup -T -D -a 1 -n client_theming-2.3.3 -##%setup -q -n client_theming-%{version} -##%setup -T -D -a 1 -n client_theming-%{version} -rm -Rf client -##mv owncloudclient-%{version} client -cd client -%patch0 -p1 -cd - -%patch1 -p1 -rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication +%setup -q -n desktop-%{version} +#%%patch0 -p1 +#rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication %build mkdir build pushd build -%cmake_kf5 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -D OEM_THEME_DIR=`pwd`/../nextcloudtheme ../client +%cmake_kf5 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" make %{?_smp_mflags} popd @@ -161,7 +150,7 @@ make install DESTDIR=%{buildroot} popd %find_lang client --with-qt mkdir -p %{buildroot}%{_datadir}/appdata/ -install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml # for distros that do not have KDE Plasma 5 @@ -172,11 +161,13 @@ rm -f %{buildroot}%{_qt5_plugindir}/nextclouddolphinactionplugin.so rm -f %{buildroot}%{_kf5_datadir}/kservices5/nextclouddolphinactionplugin.desktop %endif + # Only Fedora has Mate, so there is no need for Caja extension on EPEL %if 0%{?rhel} rm -rf %{buildroot}%{_datadir}/caja-python/ %endif + %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml @@ -213,7 +204,6 @@ fi %{_libdir}/libnextcloudsync.so.%{version} %{_libdir}/nextcloud/libocsync.so.* %doc README.md -%license client/COPYING %config %{_sysconfdir}/Nextcloud/sync-exclude.lst %dir %{_sysconfdir}/Nextcloud @@ -243,8 +233,11 @@ fi %endif %changelog -* Mon Nov 19 2018 Germano Massullo - 2.4.0-3 -- rebuilt +* Thu Nov 15 2018 Germano Massullo - 2.5.0-1 +- 2.5.0 release + +* Wed Aug 15 2018 Germano Massullo - 2.5.0-0.1 +- 2.5.0 beta 1 * Fri Jul 13 2018 Fedora Release Engineering - 2.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2c0f2b2..8761dc8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (owncloudclient-2.4.0.tar.xz) = b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0 -SHA512 (v2.3.3.tar.gz) = fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde +SHA512 (desktop-2.5.0.tar.gz) = 85591e3d5011a514472f179e48815134e12751849be9fa3457f631cdb262764801e8aecc774e0cff4d1dc4a4c34e3238a6ac1442e93ae847417d25560917ce99