Hello community, here is the log from the commit of package nextcloud-client for openSUSE:Factory checked in at 2017-03-31 15:08:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud-client (Old) and /work/SRC/openSUSE:Factory/.nextcloud-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nextcloud-client" Fri Mar 31 15:08:43 2017 rev:5 rq:482464 version:2.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud-client/nextcloud-client.changes 2017-02-07 12:03:42.399591670 +0100 +++ /work/SRC/openSUSE:Factory/.nextcloud-client.new/nextcloud-client.changes 2017-03-31 15:09:10.591022495 +0200 @@ -1,0 +2,64 @@ +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. + +------------------------------------------------------------------- Old: ---- nextcloud-client-fix-dolphin.patch nextcloud-client-fix-nemo-appname.patch nextcloud-client-fix-ru-typo.patch nextcloud-client-fix-tray-workaround.patch nextcloudclient-2.2.4.tar.xz New: ---- nextcloud-client-fix-caja-nemo-appnames.patch nextcloud-client-remove-datetime.patch nextcloud-client_2.3.1.orig.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud-client.spec ++++++ --- /var/tmp/diff_new_pack.J3pRZE/_old 2017-03-31 15:09:26.744738689 +0200 +++ /var/tmp/diff_new_pack.J3pRZE/_new 2017-03-31 15:09:26.748738124 +0200 @@ -19,26 +19,21 @@ %define soname libnextcloudsync %define sover 0 Name: nextcloud-client -Version: 2.2.4 +Version: 2.3.1 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0+ and LGPL-3.0+ Group: Productivity/Networking/File-Sharing Url: https://nextcloud.com/ -Source: nextcloudclient-%{version}.tar.xz +Source: https://launchpad.net/~nextcloud-devs/+archive/ubuntu/client/+files/%{name}_%{version}.orig.tar.bz2 Source1: sysctl-sync-inotify.conf # PATCH-FIX-OPENSUSE nextcloud-client-fix-rpath.patch sor.alexei@meowr.ru -- Fix RPATH. Patch0: nextcloud-client-fix-rpath.patch -# PATCH-FIX-OPENSUSE nextcloud-client-fix-nemo-appname.patch sor.alexei@meowr.ru -- Fix the Nemo extension appname. -Patch1: nextcloud-client-fix-nemo-appname.patch -# PATCH-FIX-OPENSUSE nextcloud-client-fix-dolphin.patch bruno@ioda-net.ch -- Fix the Dolphin plugin. -Patch2: nextcloud-client-fix-dolphin.patch -# PATCH-FIX-OPENSUSE nextcloud-client-fix-ru-typo.patch sor.alexei@meowr.ru -- Fix Russian localisation. -Patch3: nextcloud-client-fix-ru-typo.patch -# PATCH-FIX-UPSTREAM nextcloud-client-fix-tray-workaround.patch -- Fix the tray workaround (from commit 98efb07 of owncloud-client). -Patch4: nextcloud-client-fix-tray-workaround.patch +# PATCH-FIX-OPENSUSE nextcloud-client-remove-datetime.patch sor.alexei@meowr.ru -- Remove __TIME__ and __DATE__. +Patch1: nextcloud-client-remove-datetime.patch +# PATCH-FIX-OPENSUSE nextcloud-client-fix-caja-nemo-appnames.patch sor.alexei@meowr.ru -- Fix the Caja and Nemo extensions appname. +Patch2: nextcloud-client-fix-caja-nemo-appnames.patch BuildRequires: cmake >= 2.8.0 -BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: glibc-devel @@ -50,10 +45,8 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(sqlite3) Recommends: %{name}-lang -Suggests: %{name}-doc = %{version} %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: libqt5-linguist-devel -BuildRequires: python3-Sphinx BuildRequires: qtkeychain-qt5-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -65,11 +58,13 @@ BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Xml) %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +BuildRequires: doxygen BuildRequires: kio-devel +BuildRequires: python3-Sphinx +Suggests: %{name}-doc = %{version} %endif %else BuildRequires: libqt4-linguist -BuildRequires: python-Sphinx BuildRequires: qtkeychain-devel BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtDBus) @@ -91,6 +86,7 @@ %lang_package +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %package doc Summary: Documentation for nextcloud-client Group: Documentation/HTML @@ -101,6 +97,7 @@ the Nextcloud Server with your computer. This package contains the documentation. +%endif %package -n %{soname}%{sover} Summary: The Nextcloud synchronisation library @@ -118,7 +115,7 @@ Development files for the Nextcloud Desktop Client synchronisation library. -%if 0%{?suse_version} > 1310 && !(0%{?sle_version} < 130000 && !0%{?is_opensuse}) +%if 0%{?suse_version} > 1310 && !(0%{?sle_version} && !0%{?is_opensuse}) %package -n caja-extension-nextcloud Summary: Caja overlay icons Group: Productivity/File utilities @@ -173,12 +170,10 @@ %endif %prep -%setup -q -n nextcloudclient-%{version} +%setup -q -n %{name}_%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 cp -f %{SOURCE1} sysctl-sync-inotify.conf # A workaround for gh#owncloud/ownbrander#322 @@ -189,14 +184,15 @@ pushd client %cmake \ -DGIT_SHA1="GITDIR-NOTFOUND" \ - -DWITH_DOC=ON \ -DCMAKE_SKIP_RPATH=OFF \ +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) + -DWITH_DOC=ON \ +%endif %if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120100 && 0%{?is_opensuse}) -DBUILD_WITH_QT4=ON \ %endif -DOEM_THEME_DIR="$nextcloud_theme" make %{?_smp_mflags} V=1 -make doc %{?_smp_mflags} V=1 popd %install @@ -204,36 +200,34 @@ %cmake_install popd -mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ -mv -f %{buildroot}%{_datadir}/doc/client/html/ \ - %{buildroot}%{_docdir}/%{name}-doc/html/ - +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) # Properly rename mans. mv -f %{buildroot}%{_mandir}/man1/{owncloud,nextcloud}.1 mv -f %{buildroot}%{_mandir}/man1/{owncloudcmd,nextcloudcmd}.1 -%if 0%{?suse_version} > 1310 && !(0%{?sle_version} < 130000 && !0%{?is_opensuse}) -# Make a Caja extension from a Nemo's one. -install -Dpm 0644 %{buildroot}%{_datadir}/{nemo,caja}-python/extensions/syncstate.py -sed -i 's/nemo/caja/g;s/Nemo/Caja/g' \ - %{buildroot}%{_datadir}/caja-python/extensions/syncstate.py -%endif - -%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +mkdir -p %{buildroot}%{_docdir}/%{name}-doc/ +mv -f %{buildroot}%{_datadir}/doc/client/html/ \ + %{buildroot}%{_docdir}/%{name}-doc/html/ +%else # There's no Nemo in openSUSE Leap 42.1 and older. rm -rf %{buildroot}%{_datadir}/nemo-python/ %endif -# Give extensions an unconflicting name, generate bytecode. +%if 0%{?suse_version} <= 1310 || (0%{?sle_version} && !0%{?is_opensuse}) +# There's no Caja in SLE. +rm -rf %{buildroot}%{_datadir}/caja-python/ +%endif + +# Generate bytecode for extensions. for fm in caja nautilus nemo; do - [ -d %{buildroot}%{_datadir}/$fm-python/ ] || continue - mv -f %{buildroot}%{_datadir}/$fm-python/extensions/{,nextcloud}syncstate.py + if [ -d %{buildroot}%{_datadir}/$fm-python/ ]; then %py_compile %{buildroot}%{_datadir}/$fm-python/extensions/ + fi done # A workaround for gh#owncloud/client#4107 install -Dpm 0644 sysctl-sync-inotify.conf \ - %{buildroot}%{_sysconfdir}/sysctl.d/100-sync-inotify.conf + %{buildroot}%{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf %suse_update_desktop_file nextcloud %fdupes %{buildroot}%{_datadir}/ @@ -254,7 +248,7 @@ %defattr(-,root,root) %doc LICENSE %config %{_sysconfdir}/Nextcloud/ -%config %{_sysconfdir}/sysctl.d/100-sync-inotify.conf +%config %{_sysconfdir}/sysctl.d/100-%{name}-sync-inotify.conf %{_bindir}/nextcloud* %dir %{_datadir}/nextcloud/ %{_datadir}/applications/nextcloud.desktop @@ -263,15 +257,19 @@ %dir %{_datadir}/icons/hicolor/512x512/apps/ %endif %{_datadir}/icons/hicolor/*/apps/Nextcloud*.* +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %{_mandir}/man1/nextcloud*.1%{?ext_man} +%endif %files lang %defattr(-,root,root) %{_datadir}/nextcloud/i18n/ +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %files doc %defattr(-,root,root) %doc %{_docdir}/%{name}-doc/ +%endif %files -n %{soname}%{sover} %defattr(-,root,root) @@ -286,26 +284,26 @@ %{_libdir}/%{soname}.so %{_libdir}/nextcloud/libocsync.so -%if 0%{?suse_version} > 1310 && !(0%{?sle_version} < 130000 && !0%{?is_opensuse}) +%if 0%{?suse_version} > 1310 && !(0%{?sle_version} && !0%{?is_opensuse}) %files -n caja-extension-nextcloud %defattr(-,root,root) %dir %{_datadir}/caja-python/ %dir %{_datadir}/caja-python/extensions/ -%{_datadir}/caja-python/extensions/nextcloudsyncstate.py* +%{_datadir}/caja-python/extensions/syncstate-Nextcloud.py* %endif %files -n nautilus-extension-nextcloud %defattr(-,root,root) %dir %{_datadir}/nautilus-python/ %dir %{_datadir}/nautilus-python/extensions/ -%{_datadir}/nautilus-python/extensions/nextcloudsyncstate.py* +%{_datadir}/nautilus-python/extensions/syncstate-Nextcloud.py* %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) %files -n nemo-extension-nextcloud %defattr(-,root,root) %dir %{_datadir}/nemo-python/ %dir %{_datadir}/nemo-python/extensions/ -%{_datadir}/nemo-python/extensions/nextcloudsyncstate.py* +%{_datadir}/nemo-python/extensions/syncstate-Nextcloud.py* %files dolphin %defattr(-,root,root) ++++++ nextcloud-client-fix-caja-nemo-appnames.patch ++++++ --- a/client/shell_integration/nautilus/createcajaplugin.sh +++ b/client/shell_integration/nautilus/createcajaplugin.sh @@ -3,5 +3,6 @@ # this script creates a plugin for caja, just by replacing # all occurences of Nautilus with Caja (case sensitive). +cp -a syncstate.py syncstate_caja.py sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py --- a/client/shell_integration/nautilus/createnemoplugin.sh +++ b/client/shell_integration/nautilus/createnemoplugin.sh @@ -3,4 +3,5 @@ # this script creates a plugin for nemo, just be replacing # all occurences of Nautilus with Nemo. +cp -a syncstate.py syncstate_nemo.py sed -i.org -e 's/autilus/emo/g' syncstate_nemo.py ++++++ nextcloud-client-remove-datetime.patch ++++++ --- a/client/doc/conf.py.in +++ b/client/doc/conf.py.in @@ -124,7 +124,7 @@ html_static_path = ['@CMAKE_CURRENT_SOUR # 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/client/src/libsync/owncloudtheme.cpp +++ b/client/src/libsync/owncloudtheme.cpp @@ -58,7 +58,6 @@ QString ownCloudTheme::about() const Utility::escape("https://" MIRALL_STRINGIFY(APPLICATION_DOMAIN)), Utility::escape(MIRALL_STRINGIFY(APPLICATION_DOMAIN))); - devString += gitSHA1(); return devString; } --- a/client/src/libsync/theme.cpp +++ b/client/src/libsync/theme.cpp @@ -286,29 +286,6 @@ bool Theme::wizardHideFolderSizeLimitChe return false; } -QString Theme::gitSHA1() const -{ - QString devString; -#ifdef GIT_SHA1 - const QString githubPrefix(QLatin1String( - "https://github.com/owncloud/client/commit/")); - const QString gitSha1(QLatin1String(GIT_SHA1)); - devString = QCoreApplication::translate("ownCloudTheme::about()", - "<p><small>Built from Git revision <a href=\"%1\">%2</a>" - " on %3, %4 using Qt %5, %6</small></p>") - .arg(githubPrefix+gitSha1).arg(gitSha1.left(6)) - .arg(__DATE__).arg(__TIME__) - .arg(QString::fromAscii(qVersion())) -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - .arg(QSslSocket::sslLibraryVersionString()); -#else - .arg(QCoreApplication::translate("ownCloudTheme::about()", "built with %1").arg( - QString::fromAscii(OPENSSL_VERSION_TEXT))); -#endif -#endif - return devString; -} - QString Theme::about() const { QString re; @@ -322,7 +299,6 @@ QString Theme::about() const "United States, other countries, or both.</p>") .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); - re += gitSHA1(); return re; } --- a/client/src/libsync/theme.h +++ b/client/src/libsync/theme.h @@ -182,11 +182,6 @@ public: #endif /** - * The SHA sum of the released git commit - */ - QString gitSHA1() const; - - /** * About dialog contents */ virtual QString about() const; --- a/nextcloudtheme/nextcloudtheme.h +++ b/nextcloudtheme/nextcloudtheme.h @@ -85,7 +85,6 @@ public: "European Union, other countries, or both.</p>") .arg(APPLICATION_VENDOR).arg(APPLICATION_NAME); - re += gitSHA1(); return re; }