nextcloud package downgrade

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>

SPECS/nextcloud-client.spec

@@ -1,23 +1,19 @@
 %global _hardened_build 1
 
 Name:           nextcloud-client
-Version:        2.5.1
+Version:        2.3.3
 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/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
-#  - Fix a mismatch in the QtSingleApplication::messageReceived signal and the 
-# Application::slotParseMessage slot
-# These fix are needed because the system wide QtSingleApplication is slightly 
-# different from the bundled one.
-#Patch0:         %%{name}-%%{version}-syslibs.patch
+##Source0:        https://github.com/nextcloud/client_theming/archive/v%{version}.tar.gz
+# 2.3.3 Nextcloud theme not yet available
+Source0:        https://github.com/nextcloud/client_theming/archive/v2.3.2.tar.gz
+Source1:        https://download.owncloud.com/desktop/stable/owncloudclient-%{version}.tar.xz
+Source2:        nextcloud.appdata.xml
+Patch0:         %{name}-%{version}-syslibs.patch
 ## patch 1 solves https://bugzilla.redhat.com/show_bug.cgi?id=1409252
 Patch1:         %{name}-icon.patch
 
@@ -25,11 +21,10 @@ BuildRequires:  check
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  doxygen
-BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  libappstream-glib
 BuildRequires:  neon-devel
 BuildRequires:  openssl-devel
-BuildRequires:  python2-sphinx
+BuildRequires:  python-sphinx
 BuildRequires:  qtlockedfile-qt5-devel
 BuildRequires:  qtkeychain-qt5-devel >= 0.7.0
 BuildRequires:  qtsingleapplication-qt5-devel
@@ -39,8 +34,6 @@ 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
@@ -54,9 +47,6 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Provides: mirall = %{version}-%{release}
 Obsoletes: mirall < 1.8.0
 
-# Read https://bugzilla.redhat.com/show_bug.cgi?id=1651261
-ExcludeArch: ppc64 ppc64le s390x
-
 %description
 Nextcloud-client enables you to connect to your private Nextcloud Server.
 With it you can create folders in your home directory, and keep the contents
@@ -134,16 +124,24 @@ The nextcloud desktop client dolphin extension.
 %endif
 
 %prep
-%setup -q -n desktop-%{version}
-#%%patch0 -p1
-#rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
+# 2.3.2 Nextcloud theme not yet available
+%setup -q -n client_theming-2.3.2
+%setup -T -D -a 1 -n client_theming-2.3.2
+##%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
 
 
 %build
 mkdir build
 pushd build
-#%cmake_kf5 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
-%cmake3 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
+%cmake3 .. -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" -D OEM_THEME_DIR=`pwd`/../nextcloudtheme ../client
 make %{?_smp_mflags}
 popd
 
@@ -154,7 +152,7 @@ make install DESTDIR=%{buildroot}
 popd
 %find_lang client --with-qt
 mkdir -p %{buildroot}%{_datadir}/appdata/
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml
+install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/nextcloud.appdata.xml
 
 
 # for distros that do not have KDE Plasma 5
@@ -165,13 +163,11 @@ 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
 
@@ -208,6 +204,7 @@ fi
 %{_libdir}/libnextcloudsync.so.%{version}
 %{_libdir}/nextcloud/libocsync.so.*
 %doc README.md
+%license client/COPYING
 %config %{_sysconfdir}/Nextcloud/sync-exclude.lst
 %dir %{_sysconfdir}/Nextcloud
 
@@ -237,33 +234,6 @@ fi
 %endif
 
 %changelog
-* Wed Jan 09 2019 Germano Massullo <germano.massullo@cern.ch> - 2.5.1-1
-- 2.5.1 release
-
-* Mon Nov 19 2018 Germano Massullo <germano@germanomassullo.org> - 2.5.0-2
-- added ExcludeArch: ppc64, ppc64le, s390. Read https://bugzilla.redhat.com/show_bug.cgi?id=1651261
-
-* Thu Nov 15 2018 Germano Massullo <germano@germanomassullo.org> - 2.5.0-1
-- 2.5.0 release
-
-* Wed Aug 15 2018 Germano Massullo <germano.massullo@gmail.com> - 2.5.0-0.1
-- 2.5.0 beta 1
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Feb 13 2018 Germano Massullo <germano.massullo@gmail.com> - 2.4.0-1
-- 2.4.0 release
-- Updated syslibs patch, thanks to Robert-André Mauchin
-- Added comment to syslibs patch, thanks to Robert-André Mauchin
-- updated nextcloud client theming to 2.3.3
-
-* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Sep 18 2017 Nick Bebout <nb@fedoraproject.org> - 2.3.3-2
-- Change to BR python2-sphinx instead of python-sphinx
-
 * Mon Sep 11 2017 Nick Bebout <nb@fedoraproject.org> - 2.3.3-1
 - update to 2.3.3