diff --git a/nextcloud-desktop-fix-rpath.patch b/nextcloud-desktop-fix-rpath.patch
new file mode 100644
index 0000000..40db1f7
--- /dev/null
+++ b/nextcloud-desktop-fix-rpath.patch
@@ -0,0 +1,68 @@
+--- a/src/cmd/CMakeLists.txt
++++ b/src/cmd/CMakeLists.txt
+@@ -23,8 +23,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
+ add_executable(${cmd_NAME} ${cmd_SRC})
+ set_target_properties(${cmd_NAME} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
+- set_target_properties(${cmd_NAME} PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++ if(LIB_INSTALL_DIR MATCHES "^/")
++ set_target_properties(${cmd_NAME} PROPERTIES
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++ else()
++ set_target_properties(${cmd_NAME} PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++ endif()
+
+ target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core Qt5::Network)
+
+--- a/src/crashreporter/CMakeLists.txt
++++ b/src/crashreporter/CMakeLists.txt
+@@ -29,7 +29,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
+ target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
+- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ if(LIB_INSTALL_DIR MATCHES "^/")
++ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ else()
++ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
++ endif()
+ target_link_libraries(${CRASHREPORTER_EXECUTABLE}
+ crashreporter-gui
+ Qt5::Core Qt5::Widgets
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -302,8 +302,13 @@ set_target_properties( ${APPLICATION_EXE
+ RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
+ )
+ # Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
+-set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
++if(LIB_INSTALL_DIR MATCHES "^/")
++ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++else()
++ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++endif()
+
+ target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+--- a/src/libsync/CMakeLists.txt
++++ b/src/libsync/CMakeLists.txt
+@@ -128,8 +128,13 @@ set_target_properties( ${synclib_NAME}
+ SOVERSION ${MIRALL_SOVERSION}
+ RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
+ )
+-set_target_properties( ${synclib_NAME} PROPERTIES
+- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++if(LIB_INSTALL_DIR MATCHES "^/")
++ set_target_properties( ${synclib_NAME} PROPERTIES
++ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++else()
++ set_target_properties( ${synclib_NAME} PROPERTIES
++ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
++endif()
+
+ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
+ install(TARGETS ${synclib_NAME}
diff --git a/nextcloud-desktop-remove-datetime.patch b/nextcloud-desktop-remove-datetime.patch
new file mode 100644
index 0000000..1290393
--- /dev/null
+++ b/nextcloud-desktop-remove-datetime.patch
@@ -0,0 +1,26 @@
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -124,7 +124,7 @@ html_static_path = ['_shared_assets/stat
+
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
+-html_last_updated_fmt = '%b %d, %Y'
++#html_last_updated_fmt = '%b %d, %Y'
+
+ # If true, SmartyPants will be used to convert quotes and dashes to
+ # typographically correct entities.
+--- a/src/libsync/theme.cpp
++++ b/src/libsync/theme.cpp
+@@ -319,11 +319,9 @@ QString Theme::gitSHA1() const
+ const QString gitSha1(QLatin1String(GIT_SHA1));
+ devString = QCoreApplication::translate("nextcloudTheme::about()",
+ "Built from Git revision %2"
+- " on %3, %4 using Qt %5, %6
")
++ " using Qt %3, %4")
+ .arg(githubPrefix + gitSha1)
+ .arg(gitSha1.left(6))
+- .arg(__DATE__)
+- .arg(__TIME__)
+ .arg(qVersion())
+ .arg(QSslSocket::sslLibraryVersionString());
+ #endif
diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes
index 72cc33e..f98b431 100644
--- a/nextcloud-desktop.changes
+++ b/nextcloud-desktop.changes
@@ -1,22 +1,23 @@
-------------------------------------------------------------------
-Wed Mar 4 10:24:44 UTC 2020 - ecsos@opensuse.org
+Sun Mar 8 20:18:45 UTC 2020 - Alexei Sorokin
+
+- Rename nextcloud-client to nextcloud-desktop following upstream.
+
+-------------------------------------------------------------------
+Wed Mar 4 10:24:44 UTC 2020 - Eric Schirra
- Update to 2.6.4
- - desktop#1829 Fix Explorer pinning: Add fallbacks for Shell
- commands (fixes #1599)
- - desktop#1827 WebFlowCredentials: Make username comparison
- case-insensitive (fix #1741)
- - desktop#1824 ActivityListModel: Show full date and time as
- a Tooltip only
- - desktop#1823 Disable HTTP/2 for now due to Qt bug,
- allow enabling it via env var
- - desktop#1820 Fix Explorer integration re-save and hide option
- on non-Windows
- - desktop#1810 l10n: Changes to improve source strings
- - desktop#1802 Updater: Add query-parameter 'updatesegment' to
- the update check
- - docker-ci#203 Allow Desktop translation merging and custom
- backport branches
+ * Fix Explorer pinning: Add fallbacks for Shell commands
+ (gh#nextcloud/desktop#1599).
+ * WebFlowCredentials: Make username comparison case-insensitive
+ (gh#nextcloud/desktop#1741).
+ * ActivityListModel: Show full date and time as a Tooltip only.
+ * Disable HTTP/2 for now due to a Qt bug, allow enabling it via
+ an environment variable.
+ * Fix Explorer integration re-save and hide option.
+ * l10n: Changes to improve source strings.
+ * Updater: Add query-parameter "updatesegment" to the update
+ check.
-------------------------------------------------------------------
Mon Feb 17 07:16:57 UTC 2020 - ecsos@opensuse.org
@@ -127,52 +128,52 @@ Tue Nov 5 08:48:40 UTC 2019 - ecsos@opensuse.org
"use the system's update
-------------------------------------------------------------------
-Fri Sep 27 17:15:58 UTC 2019 - ecsos@opensuse.org
+Fri Nov 8 19:17:41 UTC 2019 - Alexei Sorokin
-- Update to 2.6.0
- - desktop#1222 Reinstate Debian build in the new Drone config
- - desktop#1225 Typo
- - desktop#1256 Marking unused strings as unstranslatable
- - desktop#1275 Fixes #607
- - desktop#1278 Fixes issue #878
- - desktop#1342 Fixes issue #1187
- - desktop#1347 Displays FileIgnored activities with an info icon
- - desktop#1354 Minor text change in the link to help in the tab
- 'General'.
- - desktop#1359 Update Qt 5.5 compatibility patch for Xenial
- - desktop#1360 Remove Ubuntu Cosmic and add Eoan package
- - desktop#1366 Add proper CA to client side certificate
- connection
- - desktop#1372 Remove dependency on libgnome-keyring0 on Eoan
- - desktop#1374 Read .sync_exclude.lst in each subdirectory
- - desktop#1376 Updates ChangeLog.
- - desktop#1384 Login flow v2
- - desktop#1389 Adds SSL client cert storage to webflow + Login
- Flow v2
- - desktop#1394 Windows: Workaround for CredWriteW used by
- QtKeychain
- - desktop#1399 Integrated registry check on windows when
- hasDarkSystray is called.
- - desktop#1401 Logo update
- - desktop#1402 Updated .gitignore to integrate unwanted files
- when working with VSC …
- - desktop#1405 Full-Scaled new logo in Windows 10 start menu tile
- - desktop#1408 Qt5.5 compatiblity patch for login flow V2 + UI
- improvement (Use newer digest algorithms in TLS error dialog)
- - desktop#1427 Fix for #1382 "linux client crashes for no
- discernable reason"
- - desktop#1434 UI improvement: Message box: Delete / Keep all
- files
- - desktop#1443 Improve wording of the context menu in the file
- manager extension.
- - desktop#1447 Changes wording in the share context menu.
- - Fix White Window issue on Windows by upgrading to Qt 5.12.5
+- Rename 100-nextcloud-client-sync-inotify.conf to
+ 99-nextcloud-client-sync-inotify.conf (boo#1155457).
-------------------------------------------------------------------
-Tue Aug 6 06:33:19 UTC 2019 - ecsos@opensuse.org
+Thu Oct 10 11:54:47 UTC 2019 - Dominique Leuenberger
-- Fix build errors for Leap 15.1 with Sphinx.
- Add BuildRequires python3-attrs.
+- Do not BuildRequire python: this is python2, but in other places
+ we buildrequire python3-Sphinx. This does not really belong
+ together.
+- Switch the python-nautilus Requires in
+ nautilus-extension-nextcloud to be python3-nautilus: the plugin
+ supports py3 already, so best to make use of it.
+
+-------------------------------------------------------------------
+Fri Sep 27 20:42:15 UTC 2019 - Mathias Homann
+
+- Update to 2.6.0
+ * desktop#1222 Reinstate Debian build in the new Drone config
+ * desktop#1225 Typo
+ * desktop#1256 Marking unused strings as unstranslatable
+ * desktop#1275 Fixes #607
+ * desktop#1278 Fixes issue #878
+ * desktop#1342 Fixes issue #1187
+ * desktop#1347 Displays FileIgnored activities with an info icon
+ * desktop#1354 Minor text change in the link to help in the tab 'General'.
+ * desktop#1359 Update Qt 5.5 compatibility patch for Xenial
+ * desktop#1360 Remove Ubuntu Cosmic and add Eoan package
+ * desktop#1366 Add proper CA to client side certificate connection
+ * desktop#1372 Remove dependency on libgnome-keyring0 on Eoan
+ * desktop#1374 Read .sync_exclude.lst in each subdirectory
+ * desktop#1376 Updates ChangeLog.
+ * desktop#1384 Login flow v2
+ * desktop#1389 Adds SSL client cert storage to webflow + Login Flow v2
+ * desktop#1394 Windows: Workaround for CredWriteW used by QtKeychain
+ * desktop#1399 Integrated registry check on windows when hasDarkSystray is called.
+ * desktop#1401 Logo update
+ * desktop#1402 Updated .gitignore to integrate unwanted files when working with VSC …
+ * desktop#1405 Full-Scaled new logo in Windows 10 start menu tile
+ * desktop#1408 Qt5.5 compatiblity patch for login flow V2 + UI improvement (Use newer digest algorithms in TLS error dialog)
+ * desktop#1427 Fix for #1382 "linux client crashes for no discernable reason"
+ * desktop#1434 UI improvement: Message box: Delete / Keep all files
+ * desktop#1443 Improve wording of the context menu in the file manager extension.
+ * desktop#1447 Changes wording in the share context menu.
+ * Fix White Window issue on Windows by upgrading to Qt 5.12.5
-------------------------------------------------------------------
Mon Jul 22 21:55:32 UTC 2019 - ecsos@opensuse.org
@@ -205,49 +206,220 @@ Mon Jul 22 21:55:32 UTC 2019 - ecsos@opensuse.org
- desktop#1309 Displays the uid_owner of a shared file.
-------------------------------------------------------------------
-Mon Apr 8 08:37:36 UTC 2019 - ecsos@opensuse.org
+Tue Apr 30 11:21:02 UTC 2019 - Bjoern Voigt
-- Insert BuildRequires zlib-devel.
+- Update to version 2.5.2
+ * desktop#1001 Handle spaces in username properly in login flow
+ * desktop#1006 Wizard: show an error message if there is no enough free space in the local folder
+ * desktop#1050 Removed whitespace from string
+ * desktop#1054 Do not add double slash to login flow url
+ * desktop#1057 Fix login flow with system proxy
+ * desktop#1060 Start with easier theming
+ * desktop#1062 Do not display dismissed notifications
+ * desktop#1069 Fixed l18n issue. Added space for separating string
+ * desktop#1071 Add invalid certiticate messagebox
+ * desktop#1087 Correct app passwords link
+ * desktop#1092 Be less verbose with logging
+ * desktop#1119 Fix typo in translation string
+ * desktop#778 Add a command line option to launch the client in the background
+ * desktop#923 Support Ubuntu Disco Dingo
+ * desktop#946 Added missing Include
+ * desktop#959 Make sure _profile and _page are deleted in the correct order
+ * desktop#981 Fix KDEInstallDirs deprecation warnings
+ * desktop#993 Removed Stylesheet
+- Removed nextcloud-client-fix-qt-5.12.patch
-------------------------------------------------------------------
-Wed Mar 20 19:12:46 UTC 2019 - ecsos@opensuse.org
+Tue Jan 15 15:55:48 UTC 2019 - Alexei Sorokin
-- Update to 2.5.2
- See: https://github.com/nextcloud/desktop/compare/v2.5.1...v2.5.2
-- Drop nextcloud-desktop-fix-qt-5.12.patch, because now in upstream.
+- Stop building with libcloudproviders (boo#1118327).
-------------------------------------------------------------------
-Thu Jan 3 00:50:28 UTC 2019 - ecsos@opensuse.org
+Mon Jan 7 18:11:07 UTC 2019 - Alexei Sorokin
+
+- Append to nextcloud-client-fix-qt-5.12.patch a fix for a
+ QtWebEngine crash on Qt 5.12 (commit 09b0055, boo#1120310).
+
+-------------------------------------------------------------------
+Wed Jan 2 20:48:04 UTC 2019 - Alexei Sorokin
- Add nextcloud-client-fix-qt-5.12.patch: Fix an error during build
- with Qt 5.12.
+ with Qt 5.12 (commit 1295884).
-------------------------------------------------------------------
-Mon Dec 10 13:31:24 UTC 2018 - ecsos@opensuse.org
+Tue Dec 4 13:04:12 UTC 2018 - Alexei Sorokin
-- Only change source-name from v%{version} to %{name}-%{version}.
+- Update to version 2.5.1:
+ * See https://github.com/nextcloud/desktop/compare/v2.5.0...v2.5.1
-------------------------------------------------------------------
-Wed Dec 5 08:44:41 UTC 2018 - ecsos@opensuse.org
+Wed Nov 14 12:28:56 UTC 2018 - sor.alexei@meowr.ru
-- Update to 2.5.1
- See: https://github.com/nextcloud/desktop/compare/v2.5.0...v2.5.1
+- Update to version 2.5.0:
+ * See https://github.com/nextcloud/desktop/compare/57bc791...v2.5.0
+- Remove nextcloud-client-2.3.3-fix-qt-5.11.patch,
+ nextcloud-client-fix-caja-nemo-appnames.patch: fixed upstream.
+- Rebase nextcloud-client-fix-rpath.patch,
+ nextcloud-client-remove-datetime.patch.
+- Build with libcloudproviders.
+- Drop openSUSE Leap 42.3 and older support.
-------------------------------------------------------------------
-Mon Nov 12 12:07:25 UTC 2018 - ecsos@opensuse.org
+Tue Jun 12 11:12:00 UTC 2018 - sor.alexei@meowr.ru
-- Update to 2.5.0
- - does not compile with libressl
+- Add nextcloud-client-2.3.3-fix-qt-5.11.patch: Fix Qt 5.11+
+ compatibility.
-------------------------------------------------------------------
-Mon Nov 5 14:06:30 UTC 2018 - ecsos@opensuse.org
+Thu Mar 1 12:21:22 UTC 2018 - ecsos@opensuse.org
-- Update to 2.5.0-rc2
+- fix build error for Tumbleweed
-------------------------------------------------------------------
-Sat Nov 3 09:59:54 UTC 2018 - ecsos@opensuse.org
+Mon Dec 25 11:52:57 UTC 2017 - sor.alexei@meowr.ru
-- Initial version 2.5.0-rc1
- - Renamed package to nextcloud-desktop.
- Nextcloud-client is wrong, because at owncloud github it is
- named client. But at Nextcloud github it is named desktop.
+- Use a better tarball.
+
+-------------------------------------------------------------------
+Tue Dec 5 10:45:09 UTC 2017 - sor.alexei@meowr.ru
+
+- Update to version 2.3.3:
+ * Chunking NG: Don't use old chunking on new DAV endpoint
+ (gh#owncloud/client#5855).
+ * Selective Synch: Skip excluded directories when reading DB,
+ don't let them show errors (gh#owncloud/client#5772).
+ * Settings: Make the window bigger so the Qt version is always
+ visible (gh#owncloud/client#5760).
+ * Share links: Show a warning that public link shares are public
+ (gh#owncloud/client#5786).
+ * Downloads: Re-trigger directory discovery on HTTP 404
+ (gh#owncloud/client#5799).
+ * Notifications: Propagate "Dismiss" as DELETE to server
+ (gh#owncloud/client#5922).
+ * SynchJournalDB: Don't use ._ as a filename pattern if that does
+ not work because of SMB storage settings
+ (gh#owncloud/client#5844)
+ * SynchJournalDB: Log reason for sqlite3 opening errors.
+ * Stop maintaining Qt 4 support.
+ * New synch state icon design.
+ * Add a state-information icon.
+ * Update the icon patch.
+
+-------------------------------------------------------------------
+Fri Jul 21 07:17:00 UTC 2017 - ecsos@opensuse.org
+
+- update to 2.3.2
+ * Fix more crashes (thanks to everyone submitting to our crash
+ reporter!)
+ * Improve compatibility with server 10.0 (5691, X-OC-Total-Size)
+ * Share dialog: UI improvements, Bring to front on tray click
+ * owncloudcmd: Align process return value with sync return value
+ (3936)
+ * Fix disk free check on Windows when opening the local DB
+- insert Requires: %{soname}%{sover} = %{version} because lib
+ does not up- or downgrade by up- or downgrade from client itself.
+
+-------------------------------------------------------------------
+Wed Jun 14 15:12:48 UTC 2017 - sor.alexei@meowr.ru
+
+- Only enable documentation for openSUSE Leap 14.3 and newer
+ (boo#1044061).
+
+-------------------------------------------------------------------
+Thu Mar 23 20:40:27 UTC 2017 - sor.alexei@meowr.ru
+
+- Update to version 2.3.1 (changes since 2.2.4):
+ * Decreased memory usage during synchronisation.
+ * Overlay icons: Lower CPU usage.
+ * Allow to not synchronise the server's external storages by
+ default.
+ * Switch to the new Nextcloud Server WebDAV endpoint.
+ * Chunking NG: New file upload chunking algorithm for
+ Nextcloud Server 11.0.
+ * Allow to synchronise a directory to multiple different servers
+ (filename change from .csync_journal.db to _sync_$HASH.db).
+ * Conflicts: Use the local mtime for the conflict file name
+ (gh#owncloud/client#5273).
+ * Add a "Sync now" menu item.
+ * Improve SSL Client certificate support (Show UI, Store keys in
+ keychain).
+ * Propagator: Upload smaller files in parallel.
+ * Sync Engine: Read data-fingerprint property to detect backups
+ (gh#owncloud/client#2325).
+ * GUI: Show link to create an application password/token for
+ synchronising.
+ * Share dialogue: Add a "Mail link" button.
+ * A Caja file manager plugin.
+ * Make the "backup detected" message not triggered in wrong cases.
+ * SyncEngine: Fix directory renaming when files are changed
+ (gh#owncloud/client#5192)
+ * Fix a reconnect bug if status.php intermittently returns wrong
+ data (gh#owncloud/client#5188).
+ * Improve synchronisation scheduling (gh#owncloud/client#5317).
+ * Overlay icons: Improvements in correctnes.
+ * Tray menu: Only update on demand to fix GNU/Linux desktop
+ integration glitches.
+ * Progress: Better time/bandwidth estimations.
+ * Network: Follow certain HTTP redirects (gh#owncloud/client#2791).
+ * Network: Remove all cookies (including load balancers, etc.)
+ when logging out.
+ * Discovery thread: Low priority.
+ * nextcloudsync.log: Write during propagation.
+ * Excludes: Consider files in hidden directories excluded
+ (gh#owncloud/client#5163).
+ * Allow the synchronised directory to be a symlinked directory.
+ * Improve HTTP redirect handling (gh#owncloud/client#5555).
+ * Blacklist: Escalate repeated soft error to normal error
+ (gh#owncloud/client#5500).
+ * Fix the URL for linking to application password generation for
+ ownCloud 10.0 (gh#owncloud/client#5605).
+ * Shibboleth bugfixes.
+ * Fixes with regards to low disc space.
+ * A tonne of other bugfixes.
+ * Refactorings.
+ * Improve documentation.
+ * Crash fixes.
+- Add nextcloud-client-remove-datetime.patch: Remove __TIME__ and
+ __DATE__.
+- Rebase and rename nextcloud-client-fix-nemo-appname.patch to
+ nextcloud-client-fix-caja-nemo-appnames.patch.
+- Remove nextcloud-client-fix-dolphin.patch,
+ nextcloud-client-fix-ru-typo.patch,
+ nextcloud-client-fix-tray-workaround.patch: fixed upstream.
+- Rename 100-sync-inotify.conf to the less conflicting
+ 100-nextcloud-sync-inotify.conf.
+
+-------------------------------------------------------------------
+Fri Feb 3 14:40:27 UTC 2017 - sor.alexei@meowr.ru
+
+- Add nextcloud-client-fix-dolphin.patch from bruno_friedmann to
+ fix the Dolphin plugin.
+
+-------------------------------------------------------------------
+Tue Jan 24 17:08:34 UTC 2017 - sor.alexei@meowr.ru
+
+- Add nextcloud-client-fix-tray-workaround.patch: fix the tray
+ workaround (from commit 98efb07 of owncloud-client).
+
+-------------------------------------------------------------------
+Fri Sep 30 19:06:17 UTC 2016 - ecsos@opensuse.org
+
+- Update to version 2.2.4:
+ * Dolphin Plugin: Use the Application name for the socket path
+ (gh#owncloud/client#5172).
+ * SyncEngine: Fix renaming of directories when files are changed
+ (gh#owncloud/client#5195).
+ * Selective Sync: Fix HTTP request loop and show error in view
+ (gh#owncloud/client#5154).
+ * ConnectionValidator: Properly handle error in status.php
+ request (gh#owncloud/client#5188).
+ * Discovery: Set thread priority to low (gh#owncloud/client#5017).
+ * ExcludeFiles: Fix when the directory casing is not the same in
+ the settings and in the FS.
+ * ShareLink: Ensure the password line edit is enabled
+ (gh#owncloud/client#5117).
+
+-------------------------------------------------------------------
+Fri Aug 26 21:24:30 UTC 2016 - sor.alexei@meowr.ru
+
+- Initial package.
diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec
index f97dd20..66559f3 100644
--- a/nextcloud-desktop.spec
+++ b/nextcloud-desktop.spec
@@ -21,222 +21,209 @@
Name: nextcloud-desktop
Version: 2.6.4
Release: 0
-Summary: Desktop Syncing Client for Nextcloud
-License: GPL-2.0-only
-Group: Productivity/Networking/File-Sharing
+Summary: Nextcloud desktop synchronisation client
+License: GPL-2.0-or-later AND LGPL-3.0-or-later
URL: https://nextcloud.com/
-Source0: https://github.com/nextcloud/desktop/archive/v%{version}/%{name}-%{version}.tar.gz
-##Source1: sysctl-sync-inotify.conf
-BuildRequires: cmake >= 2.8.0
-BuildRequires: doxygen
-BuildRequires: extra-cmake-modules
+Source: https://github.com/nextcloud/desktop/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+#Source1: sysctl-sync-inotify.conf
+# PATCH-FIX-OPENSUSE nextcloud-desktop-fix-rpath.patch sor.alexei@meowr.ru -- Fix RPATH.
+Patch0: nextcloud-desktop-fix-rpath.patch
+# PATCH-FIX-OPENSUSE nextcloud-desktop-remove-datetime.patch sor.alexei@meowr.ru -- Remove __TIME__ and __DATE__.
+Patch1: nextcloud-desktop-remove-datetime.patch
+BuildRequires: AppStream
+BuildRequires: cmake >= 3.2
BuildRequires: fdupes
BuildRequires: gcc-c++
+BuildRequires: glibc-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: hicolor-icon-theme
+BuildRequires: libqt5-linguist-devel
BuildRequires: pkgconfig
-BuildRequires: python3-Sphinx
-BuildRequires: python3-attrs
-BuildRequires: python3-idna >= 2.5
+BuildRequires: qtkeychain-qt5-devel
BuildRequires: update-desktop-files
-#BuildRequires: python3-Sphinx-latex
-BuildRequires: cmake(KF5Config)
-BuildRequires: cmake(KF5CoreAddons)
-BuildRequires: cmake(KF5KIO)
-BuildRequires: cmake(Qt5Keychain) >= 0.9.1
-BuildRequires: cmake(Qt5LinguistTools)
-# Upstream use Qt 5.12
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Svg)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5WebEngineWidgets)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Xml)
-BuildRequires: pkgconfig(cloudproviders)
BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(gio-2.0)
-BuildRequires: pkgconfig(libxdot)
-BuildRequires: pkgconfig(libzip)
-BuildRequires: pkgconfig(openssl) >= 1.1.0
+BuildRequires: pkgconfig(openssl) >= 1.1
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(zlib)
-BuildConflicts: libressl-devel
Requires: %{soname}%{sover} = %{version}
Recommends: %{name}-lang
Provides: nextcloud-client = %{version}
Obsoletes: nextcloud-client < %{version}
+%if 0%{?is_opensuse}
+BuildRequires: doxygen
+BuildRequires: kio-devel
+BuildRequires: python3-Sphinx
+Suggests: %{name}-doc = %{version}
+%endif
%description
-The computer Nextcloud Desktop Client is a tool to synchronize files
-from Nextcloud Server with your computer.
+The Nextcloud Desktop Client is a tool to synchronise files from
+the Nextcloud Server with your computer.
+
+Nextcloud client enables you to connect to your private
+Nextcloud Server. With it you can create directories in your home
+directory, and keep the contents of those directories synced with
+the server. Simply copy a file into the directory and the desktop
+synchronisation client does the rest.
%lang_package
+%if 0%{?is_opensuse}
%package doc
-Summary: Dcumentation for nextcloud-client
-Group: Documentation/HTML
+Summary: Documentation for nextcloud-desktop
+Provides: nextcloud-client-doc = %{version}
+Obsoletes: nextcloud-client-doc < %{version}
BuildArch: noarch
%description doc
-The Nextcloud Desktop Client is a tool to synchronise files from
+The Nextcloud Desktop Client is a tool to synchronise files from
the Nextcloud Server with your computer.
+
This package contains the documentation.
-
-%package extension-caja
-Summary: Caja overlay icons
-Group: Productivity/File utilities
-Requires: %{name} = %{version}
-Requires: caja
-Requires: python-caja
-Supplements: (%{name} and caja)
-Provides: caja-extension-nextcloud = %{version}
-Obsoletes: caja-extension-nextcloud < %{version}
-BuildArch: noarch
-
-%description extension-caja
-This package provides overlay icons to visualise the
-synchronisation state in the Caja file manager.
-
-%package extension-nautilus
-Summary: Nautilus overlay icons
-Group: Productivity/File utilities
-Requires: %{name} = %{version}
-Requires: nautilus
-Requires: python3-nautilus
-Supplements: (%{name} and nautilus)
-Provides: nautilus-extension-nextcloud = %{version}
-Obsoletes: nautilus-extension-nextcloud < %{version}
-BuildArch: noarch
-
-%description extension-nautilus
-This package provides overlay icons to visualise the
-synchronisation state in the Nautilus file manager.
-
-%package extension-nemo
-Summary: Nemo overlay icons
-Group: Productivity/File utilities
-Requires: %{name} = %{version}
-Requires: nemo
-Requires: python-nemo
-Supplements: (%{name} and nemo)
-Provides: nemo-extension-nextcloud = %{version}
-Obsoletes: nemo-extension-nextcloud < %{version}
-BuildArch: noarch
-
-%description extension-nemo
-This package provides overlay icons to visualise the
-synchronisation state in the Nemo file manager.
-
-%package extension-dolphin
-Summary: Dolphin overlay icons
-Group: Productivity/File utilities
-Requires: %{name} = %{version}
-Requires: dolphin
-Supplements: (%{name} and dolphin)
-Provides: nextcloud-client-dolphin = %{version}
-Obsoletes: nextcloud-client-dolphin < %{version}
-
-%description extension-dolphin
-This package provides the necessary plugin libraries for the
-Dolphin filemanager to display overlay icons.
+%endif
%package -n %{soname}%{sover}
Summary: The Nextcloud synchronisation library
-Group: System/Libraries
-Conflicts: %{soname}%{sover} < %{version}
%description -n %{soname}%{sover}
The Nextcloud Desktop Client synchronisation library.
%package -n %{soname}-devel
Summary: Development files for the Nextcloud synchronisation library
-Group: Development/Libraries/C and C++
Requires: %{soname}%{sover} = %{version}
%description -n %{soname}-devel
Development files for the Nextcloud Desktop Client synchronisation
library.
+%package -n nautilus-extension-nextcloud
+Summary: Nautilus overlay icons
+Requires: %{name} = %{version}
+Requires: nautilus
+Requires: python3-nautilus
+Supplements: (%{name} and nautilus)
+BuildArch: noarch
+
+%description -n nautilus-extension-nextcloud
+This package provides overlay icons to visualise the
+synchronisation state in the Nautilus file manager.
+
+%if 0%{?is_opensuse}
+%package -n caja-extension-nextcloud
+Summary: Caja overlay icons
+Requires: %{name} = %{version}
+Requires: caja
+Requires: python-caja
+Supplements: (%{name} and caja)
+BuildArch: noarch
+
+%description -n caja-extension-nextcloud
+This package provides overlay icons to visualise the
+synchronisation state in the Caja file manager.
+
+%package -n nemo-extension-nextcloud
+Summary: Nemo overlay icons
+Requires: %{name} = %{version}
+Requires: nemo
+Requires: python-nemo
+Supplements: (%{name} and nemo)
+BuildArch: noarch
+
+%description -n nemo-extension-nextcloud
+This package provides overlay icons to visualise the
+synchronisation state in the Nemo file manager.
+
+%package -n %{name}-dolphin
+Summary: Dolphin overlay icons
+Requires: %{name} = %{version}
+Requires: dolphin
+Supplements: (%{name} and dolphin)
+
+%description -n %{name}-dolphin
+This package provides the necessary plugin libraries for the
+Dolphin filemanager to display overlay icons.
+%endif
+
%prep
%setup -q -n desktop-%{version}
-##cp -a %%{SOURCE1} sysctl-sync-inotify.conf
+%patch0 -p1
+%patch1 -p1
+#cp -a %%{SOURCE1} sysctl-sync-inotify.conf
%build
-%cmake_kf5 -d build -- -DWITH_DOC=ON
-%make_jobs
+%cmake \
+%if 0%{?is_opensuse}
+ -DWITH_DOC=ON \
+%endif
+ -DCMAKE_SKIP_RPATH=OFF
+%cmake_build
%install
-%kf5_makeinstall -C build
-# move documentation
-mkdir -p %{buildroot}/%{_docdir}/%{name}/
-mv -f %{buildroot}/%{_datadir}/doc/client/nextcloud-client/html/ \
- %{buildroot}/%{_docdir}/%{name}/html/
-rm -f %{buildroot}/%{_docdir}/%{name}/html/unthemed/.buildinfo
+%cmake_install
+%if 0%{?is_opensuse}
+mkdir -p %{buildroot}%{_docdir}/%{name}-doc/
+mv -f %{buildroot}%{_datadir}/doc/client/%{name}/html/ \
+ %{buildroot}%{_docdir}/%{name}-doc/html/
+%else
+# There's no Caja and Nemo in SLE.
+rm -r %{buildroot}%{_datadir}/caja-python/
+rm -r %{buildroot}%{_datadir}/nemo-python/
+%endif
+# Generate bytecode for extensions.
+for fm in caja nautilus nemo; do
+ if [ -d %{buildroot}%{_datadir}/$fm-python/ ]; then
+ %py3_compile %{buildroot}%{_datadir}/$fm-python/extensions/
+ fi
+done
+
+# ecsos: Comment this out, because it seems to be a security risk.
+# See: https://github.com/owncloud/client/issues/4107#issuecomment-240627858
# A workaround for gh#owncloud/client#4107
-# ecsos:
-# Comment this out, because it seems to be a security risc.
-# see: https://github.com/owncloud/client/issues/4107#issuecomment-240627858
-# Is this relevant for nextcloud? Issue is from owncloud?
-##install -Dpm 0644 sysctl-sync-inotify.conf \
-## %%{buildroot}%%{_sysconfdir}/sysctl.d/100-%%{name}-sync-inotify.conf
+#install -Dpm 0644 sysctl-sync-inotify.conf \
+# %%{buildroot}%%{_sysconfdir}/sysctl.d/99-%%{name}-sync-inotify.conf
%suse_update_desktop_file nextcloud
%fdupes %{buildroot}%{_datadir}/
%post -n %{soname}%{sover} -p /sbin/ldconfig
+
%postun -n %{soname}%{sover} -p /sbin/ldconfig
%files
-%license COPYING COPYING.documentation
-%doc README.md
-%dir %{_sysconfdir}/Nextcloud/
-%dir %{_libdir}/nextcloud/
-%dir %{_datadir}/nextcloud/
-%dir %{_datadir}/icons/hicolor/*/
-%dir %{_datadir}/icons/hicolor/*/apps
-%config(noreplace) %{_sysconfdir}/Nextcloud/*
+%license COPYING*
+%config %{_sysconfdir}/Nextcloud/
+%config %{_sysconfdir}/sysctl.d/99-%{name}-sync-inotify.conf
%{_bindir}/nextcloud*
-%{_datadir}/icons/hicolor/*/apps/*
+%dir %{_datadir}/nextcloud/
%{_datadir}/applications/nextcloud.desktop
-%dir %{_datadir}/cloud-providers/
-%{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
-%{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
+%dir %{_datadir}/icons/hicolor/1024x1024/
+%dir %{_datadir}/icons/hicolor/1024x1024/apps/
+%{_datadir}/icons/hicolor/*/apps/Nextcloud*.*
%files lang
%{_datadir}/nextcloud/i18n/
+%if 0%{?is_opensuse}
%files doc
-%doc %{_docdir}/%{name}/html/
-
-%files extension-caja
-%dir %{_datadir}/caja-python/
-%dir %{_datadir}/caja-python/extensions/
-%{_datadir}/caja-python/extensions/syncstate-Nextcloud.py*
-
-%files extension-nautilus
-%dir %{_datadir}/nautilus-python/
-%dir %{_datadir}/nautilus-python/extensions/
-%{_datadir}/nautilus-python/extensions/syncstate-Nextcloud.py*
-
-%files extension-nemo
-%dir %{_datadir}/nemo-python/
-%dir %{_datadir}/nemo-python/extensions/
-%{_datadir}/nemo-python/extensions/syncstate-Nextcloud.py*
-
-%files extension-dolphin
-%dir %{_libdir}/qt5/plugins/kf5/overlayicon/
-%{_libdir}/libnextclouddolphinpluginhelper.so
-%{_libdir}/qt5/plugins/nextclouddolphinactionplugin.so
-%{_libdir}/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
-%{_datadir}/kservices5/nextclouddolphinactionplugin.desktop
+%doc %{_docdir}/%{name}-doc/
+%endif
%files -n %{soname}%{sover}
-%license COPYING
-%dir %{_libdir}/nextcloud/
+%license COPYING*
%{_libdir}/%{soname}.so.*
+%dir %{_libdir}/nextcloud/
%{_libdir}/nextcloud/libocsync.so.*
%files -n %{soname}-devel
@@ -244,4 +231,34 @@ rm -f %{buildroot}/%{_docdir}/%{name}/html/unthemed/.buildinfo
%{_libdir}/%{soname}.so
%{_libdir}/nextcloud/libocsync.so
+%files -n nautilus-extension-nextcloud
+%dir %{_datadir}/nautilus-python/
+%dir %{_datadir}/nautilus-python/extensions/
+%dir %{_datadir}/nautilus-python/extensions/__pycache__
+%{_datadir}/nautilus-python/extensions/syncstate-Nextcloud.py*
+%{_datadir}/nautilus-python/extensions/__pycache__/syncstate-Nextcloud*
+
+%if 0%{?is_opensuse}
+%files -n caja-extension-nextcloud
+%dir %{_datadir}/caja-python/
+%dir %{_datadir}/caja-python/extensions/
+%dir %{_datadir}/caja-python/extensions/__pycache__
+%{_datadir}/caja-python/extensions/syncstate-Nextcloud.py*
+%{_datadir}/caja-python/extensions/__pycache__/*
+
+%files -n nemo-extension-nextcloud
+%dir %{_datadir}/nemo-python/
+%dir %{_datadir}/nemo-python/extensions/
+%dir %{_datadir}/nemo-python/extensions/__pycache__
+%{_datadir}/nemo-python/extensions/syncstate-Nextcloud.py*
+%{_datadir}/nemo-python/extensions/__pycache__/*
+
+%files dolphin
+%{_libdir}/libnextclouddolphinpluginhelper.so
+%{_libdir}/qt5/plugins/nextclouddolphinactionplugin.so
+%dir %{_libdir}/qt5/plugins/kf5/overlayicon/
+%{_libdir}/qt5/plugins/kf5/overlayicon/nextclouddolphinoverlayplugin.so
+%{_datadir}/kservices5/nextclouddolphinactionplugin.desktop
+%endif
+
%changelog