Accepting request 883898 from network
OBS-URL: https://build.opensuse.org/request/show/883898 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nextcloud-desktop?expand=0&rev=13
This commit is contained in:
Richard Brown
Git OBS Bridge
commit
5ca9a865ac
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2e300db5942f6ba06d72f96baf70b12d210e66e2b89da1f7138e8ae5a2891adb
|
||||
size 19552683
|
||||
3
nextcloud-desktop-3.2.0.tar.gz
Normal file
3
nextcloud-desktop-3.2.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f9eecea9484f750fa86908c51db91b2fbfadd9b32cf73a68328e7d28d27dec56
|
||||
size 15208180
|
||||
@ -1,72 +0,0 @@
|
||||
Index: desktop-3.1.0/src/cmd/CMakeLists.txt
|
||||
===================================================================
|
||||
--- desktop-3.1.0.orig/src/cmd/CMakeLists.txt
|
||||
+++ desktop-3.1.0/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} )
|
||||
+ 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)
|
||||
|
||||
Index: desktop-3.1.0/src/crashreporter/CMakeLists.txt
|
||||
===================================================================
|
||||
--- desktop-3.1.0.orig/src/crashreporter/CMakeLists.txt
|
||||
+++ desktop-3.1.0/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} )
|
||||
+ 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
|
||||
Index: desktop-3.1.0/src/gui/CMakeLists.txt
|
||||
===================================================================
|
||||
--- desktop-3.1.0.orig/src/gui/CMakeLists.txt
|
||||
+++ desktop-3.1.0/src/gui/CMakeLists.txt
|
||||
@@ -325,8 +325,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::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
|
||||
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
||||
Index: desktop-3.1.0/src/libsync/CMakeLists.txt
|
||||
===================================================================
|
||||
--- desktop-3.1.0.orig/src/libsync/CMakeLists.txt
|
||||
+++ desktop-3.1.0/src/libsync/CMakeLists.txt
|
||||
@@ -126,8 +126,13 @@ set_target_properties( ${synclib_NAME}
|
||||
SOVERSION ${MIRALL_SOVERSION}
|
||||
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
||||
)
|
||||
-set_target_properties( ${synclib_NAME} PROPERTIES
|
||||
+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}
|
||||
@ -1,3 +1,97 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 8 18:18:51 UTC 2021 - ecsos <ecsos@opensuse.org>
|
||||
|
||||
- Update to 3.2.0
|
||||
- No changelog from upstream at this time.
|
||||
- Drop nextcloud-desktop-fix-rpath.patch because RPATH no more in
|
||||
CMakeLists.
|
||||
- Changes from 3.2.0-rc3
|
||||
- desktop#3015 Update documentation for the account wizard
|
||||
- desktop#3040 Don't deploy bearer plugin on MacOS
|
||||
- desktop#3042 Temp fix for vfs failure.
|
||||
- desktop#3043 Fix VFS CfAPI Syncroot Register Error.
|
||||
- desktop#3049 Bump version to 3.1.83.
|
||||
- Changes from 3.2.0-rc2
|
||||
- desktop#2505 Status feature
|
||||
- desktop#2967 Add missing error handling for downloads of client side encryption
|
||||
- desktop#2976 Split content of User::isValueableActivity()
|
||||
- desktop#2981 Refresh Windows download dialog progress when hydrating a placeholder
|
||||
- desktop#2989 Display the content of the login dialog correct
|
||||
- desktop#2990 Fix crash when trying to open the folder creation dialog
|
||||
- desktop#2995 Repair basic auth support
|
||||
- desktop#2998 Fix incorrect type when reading the 'logExpire' property from config.
|
||||
- desktop#2999 Don't customize settings dialog palette
|
||||
- desktop#3009 Don't check against product name if checking server version
|
||||
- desktop#3010 CFAPI: Handle cancelation of hydration requests
|
||||
- desktop#3016 Fix for Windows CreateFile long path
|
||||
- desktop#3020 Increase logging around file removal events
|
||||
- desktop#3025 Enable high dpi scaling on all platforms
|
||||
- desktop#3028 Check reading from journal was successful before remove placeholder
|
||||
- desktop#3029 L10n: Change sync message
|
||||
- Changes from 3.2.0-rc1
|
||||
- desktop#2700 Major engine update
|
||||
- desktop#2725 Make monochrome icons the default on Linux and Mac OS.
|
||||
- desktop#2726 UI improvements: Settings dialog
|
||||
- desktop#2732 Replace dots with ellipses and add spaces.
|
||||
- desktop#2733 Move space in "owncloudadvancedsetuppage.cpp"
|
||||
- desktop#2734 Move space in "folderwizard.cpp"
|
||||
- desktop#2735 Change the quotation marks
|
||||
- desktop#2739 Fixed the autostart for AppImages. See #2504.
|
||||
- desktop#2748 Removed translation for "etag" and changed spelling
|
||||
- desktop#2749 Changed triple dot to ellipsis
|
||||
- desktop#2759 Add support for Hirsute
|
||||
- desktop#2778 Windows cfapi backend for vfs
|
||||
- desktop#2781 Cherry pick 2020 w53
|
||||
- desktop#2793 XAttr backend for VFS
|
||||
- desktop#2794 Remove NO_SHIBBOLETH flag and dead code
|
||||
- desktop#2799 E2ee root folder remove issue
|
||||
- desktop#2800 Fix CfAPI wrapper build in Win32 mode
|
||||
- desktop#2801 Fix CfAPI Win32 build
|
||||
- desktop#2814 Add push notifications for file changes
|
||||
- desktop#2815 Update Github issue template and documentation with the new 3.1 option to "Create Debug Archive".
|
||||
- desktop#2821 E2EE fix upload parallelism issue.
|
||||
- desktop#2823 Repair chunked uploads
|
||||
- desktop#2824 Fix e2ee folder move issue
|
||||
- desktop#2826 Reference coding style wiki page from CONTRIBIUTING.md
|
||||
- desktop#2827 Integrate the version suffix to the MSI filename
|
||||
- desktop#2834 Compile nextcoud gui as separate library
|
||||
- desktop#2840 Avoid keeping Account alive via a shared ptr in ClientSideEncryption
|
||||
- desktop#2844 Handle SVG branded clients
|
||||
- desktop#2845 Default to colored systray on linux
|
||||
- desktop#2853 E2ee fix rename root folder issue & Fix upload stuck issue due to incorrect Lock/Unlock sequence
|
||||
- desktop#2859 Fix build against Qt 5.15.3
|
||||
- desktop#2860 Removed blank before colon
|
||||
- desktop#2864 Fixes for wizard advanced setup
|
||||
- desktop#2865 VFS CfAPI implementation shouldn't get stuck
|
||||
- desktop#2867 Start file conflict resolve dialog asynchronous
|
||||
- desktop#2868 Don't treat new folders in unpinned folders as files to dehydrate
|
||||
- desktop#2872 Use push notifications for Tray activities/notifications fetch trigger.
|
||||
- desktop#2874 Reduce exempt labels list to give a chance to stale bot to do something
|
||||
- desktop#2875 Specify PUBLIC for the link targets to make them visible to windeployqt
|
||||
- desktop#2877 Revert "Specify PUBLIC for the link targets to make them visible to w…
|
||||
- desktop#2892 Repair E2EE on sync folders which don't point to the root of the server on the remote end
|
||||
- desktop#2894 Documentation: break line in config example.
|
||||
- desktop#2895 Improve wizard ui
|
||||
- desktop#2897 Allow creation of new folders from the Settings Dialog.
|
||||
- desktop#2900 Load the theme resource explictly
|
||||
- desktop#2901 Win tests compilation fix.
|
||||
- desktop#2904 Move FolderCreationDialog into the OCC namespace
|
||||
- desktop#2906 Validate sensitive URLs to onle allow http(s) schemes.
|
||||
- desktop#2914 Configuration Options for Windows Registry
|
||||
- desktop#2919 Validate the providers ssl certificate
|
||||
- desktop#2925 Fix incorrect logger output for non-Latin strings.
|
||||
- desktop#2928 Add missing override specifier
|
||||
- desktop#2931 WIP: Build Instructions
|
||||
- desktop#2935 Do not add debug build to startup programs.
|
||||
- desktop#2937 Stale: issue must have bug and must not have approved label
|
||||
- desktop#2948 Fix crash when opening conflict dialog
|
||||
- desktop#2949 Move from stale bot to stale action
|
||||
- desktop#2951 Log error message from CFAPI
|
||||
- desktop#2958 VFS Windows: Fix download of large files
|
||||
- desktop#2972 Do no include glib.h with extern C
|
||||
- desktop#2979 Do not include glib.h with extern C (2)
|
||||
- desktop#2986 Bump version to 3.1.81
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Feb 20 10:24:03 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
%define soname libnextcloudsync
|
||||
%define sover 0
|
||||
Name: nextcloud-desktop
|
||||
Version: 3.1.3
|
||||
Version: 3.2.0
|
||||
Release: 0
|
||||
Summary: Nextcloud desktop synchronisation client
|
||||
License: GPL-2.0-or-later AND LGPL-3.0-or-later
|
||||
@ -27,8 +27,6 @@ Group: Productivity/Networking/File-Sharing
|
||||
URL: https://nextcloud.com/
|
||||
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
|
||||
@ -45,7 +43,7 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: qtkeychain-qt5-devel
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: cmake(KF5Config)
|
||||
BuildRequires: cmake(KF5KIO)
|
||||
BuildRequires: cmake(KF5KIO) >= 5.16
|
||||
BuildRequires: cmake(Qt5Keychain)
|
||||
BuildRequires: pkgconfig(Qt5Concurrent)
|
||||
BuildRequires: pkgconfig(Qt5Core) >= 5.12
|
||||
@ -175,17 +173,15 @@ Dolphin filemanager to display overlay icons.
|
||||
|
||||
%prep
|
||||
%setup -q -n desktop-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
cp -a %{SOURCE1} sysctl-sync-inotify.conf
|
||||
|
||||
%build
|
||||
%cmake \
|
||||
%if 0%{?is_opensuse}
|
||||
-DWITH_DOC=ON \
|
||||
-DNO_SHIBBOLETH=1 \
|
||||
-DWITH_DOC=ON \
|
||||
-DNO_SHIBBOLETH=1
|
||||
%endif
|
||||
-DCMAKE_SKIP_RPATH=OFF
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
@ -234,6 +230,7 @@ done
|
||||
%dir %{_datadir}/cloud-providers/
|
||||
%{_datadir}/cloud-providers/com.nextcloudgmbh.Nextcloud.ini
|
||||
%{_datadir}/dbus-1/services/com.nextcloudgmbh.Nextcloud.service
|
||||
%{_datadir}/mime/packages/nextcloud.xml
|
||||
|
||||
%files lang
|
||||
%{_datadir}/nextcloud/i18n/
|
||||
@ -246,13 +243,12 @@ done
|
||||
%files -n %{soname}%{sover}
|
||||
%license COPYING*
|
||||
%{_libdir}/%{soname}.so.*
|
||||
%dir %{_libdir}/nextcloud/
|
||||
%{_libdir}/nextcloud/libocsync.so.*
|
||||
%{_libdir}/libnextcloud_csync.so.*
|
||||
|
||||
%files -n %{soname}-devel
|
||||
%{_includedir}/nextcloudsync/
|
||||
%{_libdir}/%{soname}.so
|
||||
%{_libdir}/nextcloud/libocsync.so
|
||||
%{_libdir}/libnextcloud_csync.so
|
||||
|
||||
%files -n nautilus-extension-nextcloud
|
||||
%dir %{_datadir}/nautilus-python/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user