Hello community, here is the log from the commit of package owncloud-client for openSUSE:Factory checked in at 2018-09-26 16:11:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old) and /work/SRC/openSUSE:Factory/.owncloud-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "owncloud-client" Wed Sep 26 16:11:32 2018 rev:14 rq:636584 version:2.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes 2018-08-18 00:02:45.330833872 +0200 +++ /work/SRC/openSUSE:Factory/.owncloud-client.new/owncloud-client.changes 2018-09-26 16:11:32.487474199 +0200 @@ -1,0 +2,20 @@ +Tue Sep 18 15:12:04 UTC 2018 - klaas.freitag@suse.com + +- Really removed the rpath.diff file. + +------------------------------------------------------------------- +Tue Sep 18 09:19:12 UTC 2018 - klaas.freitag@suse.com + +- update to upstream version 2.5.0 + Changelog available at https://owncloud.org/changelog/desktop-client/ + + * Removed patch rpath.diff as not longer required. + * Added some doc cleanup as the version installs too much. + +------------------------------------------------------------------- +Tue Sep 4 05:27:18 UTC 2018 - klaas.freitag@suse.com + +- Fixed patch fix-systray-menu-pos.patch to avoid segfault as + described in boo#1106103. Should be fixed with this. + +------------------------------------------------------------------- Old: ---- owncloudclient_os-2.4.3.tar.xz rpath.diff New: ---- owncloudclient_os-2.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ owncloud-client.spec ++++++ --- /var/tmp/diff_new_pack.AiNknV/_old 2018-09-26 16:11:33.371472731 +0200 +++ /var/tmp/diff_new_pack.AiNknV/_new 2018-09-26 16:11:33.371472731 +0200 @@ -18,7 +18,7 @@ Name: owncloud-client -Version: 2.4.3 +Version: 2.5.0 Release: 0 Summary: The ownCloud synchronization client @@ -28,14 +28,10 @@ Source0: owncloudclient_os-%{version}.tar.xz Source1: 101-sync-inotify.conf Source2: README.source -# PATCH-FIX-UPSTREAM rpath.diff Fix rpath -Patch0: rpath.diff # PATCH-FIX-UPSTREAM fix position of systray menu https://github.com/owncloud/client/issues/5968 # for all except tumbleweed and ongoing, as the Qt bug is fixed in there. -%if 0%{?suse_version} <= 1500 -Patch1: fix-systray-menu-pos.patch -%endif +Patch0: fix-systray-menu-pos.patch %define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir} @@ -207,10 +203,8 @@ %prep %setup -q -n owncloudclient-%{version} -%patch0 -p1 - %if 0%{?suse_version} <= 1500 -%patch1 -p1 +%patch0 -p1 %endif %build @@ -241,7 +235,7 @@ env LD_RUN_PATH=%{_libdir}/owncloud:%{_libdir}/owncloud make %{?_smp_mflags} VERBOSE=1 -make doc +make doc-html-org make doc-man %install @@ -254,8 +248,12 @@ rm %{buildroot}%{_docdir}/%{name}/html/unthemed/.buildinfo mv %{buildroot}%{_docdir}/%{name}/html/unthemed/* %{buildroot}%{_docdir}/%{name}/html/ rmdir %{buildroot}%{_docdir}/%{name}/html/unthemed +rm -r %{buildroot}%{_docdir}/%{name}/html/com/ +rm -r %{buildroot}%{_docdir}/%{name}/html/org/ +# Copy the +cp COPYING.documentation %{buildroot}%{_docdir}/%{name}/ -# Copy the source README here to be picked up by %doc macro +# Copy the source README here to be picked up by doc macro cp %{SOURCE2} . if [ -d %{buildroot}%{_mandir}/man1 ]; then @@ -296,6 +294,7 @@ %{_bindir}/owncloudcmd %{_datadir}/applications/owncloud.desktop %{_datadir}/icons/hicolor +%{_datadir}/mime/packages/owncloud.xml %{_mandir}/man1/owncloud* %doc CONTRIBUTING.md COPYING ChangeLog README.md README.source %exclude %{_docdir}/%{name}/COPYING.documentation @@ -308,7 +307,7 @@ %files -n %{name}-doc %defattr(-,root,root,-) %doc %{_docdir}/%{name}/html -%doc COPYING.documentation +%doc %{_docdir}/%{name}/COPYING.documentation %exclude %{_docdir}/%{name}/CONTRIBUTING.md %exclude %{_docdir}/%{name}/COPYING %exclude %{_docdir}/%{name}/ChangeLog @@ -322,13 +321,12 @@ %files -n libowncloudsync0 %defattr(-,root,root,-) %{_libdir}/libowncloudsync.so.* -%{_libdir}/owncloud/libocsync.so.* -%dir %{_libdir}/owncloud +%{_libdir}/libowncloud_csync.so.* %files -n libowncloudsync-devel %defattr(-,root,root,-) %{_libdir}/libowncloudsync.so -%{_libdir}/owncloud/libocsync.so +%{_libdir}/libowncloud_csync.so %{_includedir}/owncloudsync/ %files -n %{name}-nautilus ++++++ fix-systray-menu-pos.patch ++++++ --- /var/tmp/diff_new_pack.AiNknV/_old 2018-09-26 16:11:33.411472665 +0200 +++ /var/tmp/diff_new_pack.AiNknV/_new 2018-09-26 16:11:33.411472665 +0200 @@ -1,14 +1,20 @@ diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp -index c8d5cddcd..6e3f6871a 100644 +index a56dc44..c586118 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp -@@ -530,7 +530,8 @@ void ownCloudGui::setupContextMenu() +@@ -509,9 +509,12 @@ void ownCloudGui::setupContextMenu() || desktopSession.contains("plasma") || desktopSession.contains("kde"); QObject *platformMenu = reinterpret_cast<QObject *>(_tray->contextMenu()->platformMenu()); - if (isKde && platformMenu && platformMenu->metaObject()->className() == QLatin1String("QDBusPlatformMenu")) { -+ const QString className = platformMenu->metaObject()->className(); -+ if (isKde && platformMenu && className == QLatin1String("SystemTrayMenu") ) { // QLatin1String("QDBusPlatformMenu")) { - _workaroundManualVisibility = true; - _workaroundNoAboutToShowUpdate = true; +- _workaroundManualVisibility = true; +- _workaroundNoAboutToShowUpdate = true; ++ if (platformMenu) { ++ const QString className = platformMenu->metaObject()->className(); ++ if (isKde && className == QLatin1String("SystemTrayMenu") ) { // QLatin1String("QDBusPlatformMenu")) { ++ _workaroundManualVisibility = true; ++ _workaroundNoAboutToShowUpdate = true; ++ } } + #endif + ++++++ owncloudclient_os-2.4.3.tar.xz -> owncloudclient_os-2.5.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/owncloud-client/owncloudclient_os-2.4.3.tar.xz /work/SRC/openSUSE:Factory/.owncloud-client.new/owncloudclient_os-2.5.0.tar.xz differ: char 25, line 1