Hello community, here is the log from the commit of package owncloud-client for openSUSE:Factory checked in at 2018-01-19 11:52:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old) and /work/SRC/openSUSE:Factory/.owncloud-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "owncloud-client" Fri Jan 19 11:52:18 2018 rev:9 rq:561305 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes 2017-10-23 16:53:15.220791897 +0200 +++ /work/SRC/openSUSE:Factory/.owncloud-client.new/owncloud-client.changes 2018-01-19 11:52:33.769477413 +0100 @@ -1,0 +2,37 @@ +Mon Jan 1 21:03:19 UTC 2018 - [email protected] + +- Removed superflous patch force_qdbus_tray_workaround.patch + +------------------------------------------------------------------- +Mon Jan 1 19:50:51 UTC 2018 - [email protected] + +- Bring back the doc macro to mark the documentation files. + Fix building by utilizing the exclude macro. + +------------------------------------------------------------------- +Fri Dec 29 11:41:41 UTC 2017 - [email protected] + +- Fixed documentation installation by avoiding the %doc macro. + +------------------------------------------------------------------- +Thu Dec 28 21:15:16 UTC 2017 - [email protected] + +- Added rpath.diff: Fix the rpath to the private libs of owncloud + Fixed documentation file list issue + +------------------------------------------------------------------- +Wed Dec 27 11:58:22 UTC 2017 - [email protected] + +- Feedback from review: + * Use %{buildroot} instead of ${RPM_BUILD_ROOT} + * Leave license- and few other readme files with the main package + +------------------------------------------------------------------- +Mon Dec 25 11:34:37 UTC 2017 - [email protected] + +- Update to version 2.4.0 with lots of fixes and additions. + Detailed changelog: + https://raw.githubusercontent.com/owncloud/client/master/ChangeLog +- Drop force_qdbus_tray_workaround.patch: Problem fixed upstream. + +------------------------------------------------------------------- Old: ---- force_qdbus_tray_workaround.patch owncloudclient_os-2.3.3.tar.xz New: ---- owncloudclient_os-2.4.0.tar.xz rpath.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ owncloud-client.spec ++++++ --- /var/tmp/diff_new_pack.GFJLWa/_old 2018-01-19 11:52:37.081321317 +0100 +++ /var/tmp/diff_new_pack.GFJLWa/_new 2018-01-19 11:52:37.085321128 +0100 @@ -1,7 +1,7 @@ # # spec file for package owncloud-client # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: owncloud-client -Version: 2.3.3 +Version: 2.4.0 Release: 0 Summary: The ownCloud synchronization client @@ -28,8 +28,8 @@ Source0: owncloudclient_os-%{version}.tar.xz Source1: 101-sync-inotify.conf Source2: README.source -# PATCH-FIX-UPSTREAM fix tray behaviour (only Leap 42.2) -Patch0: force_qdbus_tray_workaround.patch +# PATCH-FIX-UPSTREAM rpath.diff Fix rpath +Patch0: rpath.diff %define cmake_args -DSYSCONF_INSTALL_DIR=%{_sysconfdir} @@ -199,18 +199,14 @@ %prep %setup -q -n owncloudclient-%{version} -%if 0%{?is_opensuse} && 0%{?suse_version} == 1315 && 0%{?sle_version} == 120200 -# openSUSE_Leap_42.2 only, https://github.com/owncloud/client/issues/5960#issuecomment-322406761 + %patch0 -p1 -%endif %build echo suse_version 0%{?suse_version} -mkdir build -pushd build # http://www.cmake.org/Wiki/CMake_RPATH_handling#Default_RPATH_settings -cmake .. -DWITH_DOC=TRUE \ +%cmake .. -DWITH_DOC=TRUE \ -DKDE_INSTALL_USE_QT_SYS_PATHS=1 \ -DCMAKE_C_FLAGS:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ @@ -235,31 +231,33 @@ env LD_RUN_PATH=%{_libdir}/owncloud:%{_libdir}/owncloud make %{?_smp_mflags} VERBOSE=1 make doc -popd +make doc-man %install -pushd build -%make_install +%cmake_install -mkdir -p ${RPM_BUILD_ROOT}%{_docdir}/%{name} -mv ${RPM_BUILD_ROOT}/usr/share/doc/client/* ${RPM_BUILD_ROOT}%{_docdir}/%{name} -rmdir ${RPM_BUILD_ROOT}/usr/share/doc/client -rm ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed/.buildinfo -mv ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed/* ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/ -rmdir ${RPM_BUILD_ROOT}%{_docdir}/%{name}/html/unthemed -popd +mkdir -p %{buildroot}%{_docdir}/%{name} +mv %{buildroot}/usr/share/doc/client/owncloud-client/* %{buildroot}%{_docdir}/%{name} +rmdir %{buildroot}/usr/share/doc/client/owncloud-client +rmdir %{buildroot}/usr/share/doc/client +rm %{buildroot}%{_docdir}/%{name}/html/unthemed/.buildinfo +mv %{buildroot}%{_docdir}/%{name}/html/unthemed/* %{buildroot}%{_docdir}/%{name}/html/ +rmdir %{buildroot}%{_docdir}/%{name}/html/unthemed -if [ -d ${RPM_BUILD_ROOT}%{_mandir}/man1 ]; then - gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/*.1 +# Copy the source README here to be picked up by %doc macro +cp %{SOURCE2} . + +if [ -d %{buildroot}%{_mandir}/man1 ]; then + gzip %{buildroot}%{_mandir}/man1/*.1 fi -%define extdir ${RPM_BUILD_ROOT}%{_datadir}/nautilus-python/extensions +%define extdir %{buildroot}%{_datadir}/nautilus-python/extensions test -f %{extdir}/ownCloud.py && mv %{extdir}/ownCloud.py %{extdir}/owncloud.py || true test -f %{extdir}/ownCloud.pyo && mv %{extdir}/ownCloud.pyo %{extdir}/owncloud.pyo || true test -f %{extdir}/ownCloud.pyc && mv %{extdir}/ownCloud.pyc %{extdir}/owncloud.pyc || true # https://github.com/owncloud/client/issues/4107 -install -m 0755 -D %{SOURCE1} ${RPM_BUILD_ROOT}/etc/sysctl.d/101-sync-inotify.conf +install -m 0755 -D %{SOURCE1} %{buildroot}/etc/sysctl.d/101-sync-inotify.conf %suse_update_desktop_file -n owncloud # workaround for https://github.com/owncloud/ownbrander/issues/322 @@ -288,14 +286,23 @@ %{_datadir}/applications/owncloud.desktop %{_datadir}/icons/hicolor %{_mandir}/man1/owncloud* +%doc CONTRIBUTING.md COPYING ChangeLog README.md README.source +%exclude %{_docdir}/%{name}/COPYING.documentation +%exclude %{_docdir}/%{name}/html + %config /etc/ownCloud # https://github.com/owncloud/client/issues/4107 %config /etc/sysctl.d/101-sync-inotify.conf %files -n %{name}-doc %defattr(-,root,root,-) -%doc README.md COPYING -%doc %{_docdir}/%{name} +%doc %{_docdir}/%{name}/html +%doc COPYING.documentation +%exclude %{_docdir}/%{name}/CONTRIBUTING.md +%exclude %{_docdir}/%{name}/COPYING +%exclude %{_docdir}/%{name}/ChangeLog +%exclude %{_docdir}/%{name}/README.md +%exclude %{_docdir}/%{name}/README.source %files -n %{name}-l10n %defattr(-,root,root,-) ++++++ owncloudclient_os-2.3.3.tar.xz -> owncloudclient_os-2.4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/owncloud-client/owncloudclient_os-2.3.3.tar.xz /work/SRC/openSUSE:Factory/.owncloud-client.new/owncloudclient_os-2.4.0.tar.xz differ: char 26, line 1 ++++++ rpath.diff ++++++ diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 12fff82..5c9b681 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -31,7 +31,7 @@ if(NOT BUILD_LIBRARIES_ONLY) 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}" ) + INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) target_link_libraries(${cmd_NAME} ${synclib_NAME}) endif() diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt index b73e38f..901c651 100644 --- a/src/crashreporter/CMakeLists.txt +++ b/src/crashreporter/CMakeLists.txt @@ -36,7 +36,7 @@ if(NOT BUILD_LIBRARIES_ONLY) 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}" ) + set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" ) target_link_libraries(${CRASHREPORTER_EXECUTABLE} crashreporter-gui ${QT_LIBRARIES} diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2ae9573..51feb2e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -298,7 +298,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES ) # 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 - INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) + INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} ) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index eeb8fa0..bfad3de 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -131,7 +131,7 @@ set_target_properties( ${synclib_NAME} PROPERTIES 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}" ) + INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" ) target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
