Hello community, here is the log from the commit of package qsyncthingtray for openSUSE:Factory checked in at 2018-06-19 11:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qsyncthingtray (Old) and /work/SRC/openSUSE:Factory/.qsyncthingtray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qsyncthingtray" Tue Jun 19 11:56:14 2018 rev:4 rq:616314 version:0.5.8 Changes: -------- --- /work/SRC/openSUSE:Factory/qsyncthingtray/qsyncthingtray.changes 2017-07-08 12:35:59.364998005 +0200 +++ /work/SRC/openSUSE:Factory/.qsyncthingtray.new/qsyncthingtray.changes 2018-06-19 11:56:20.066359277 +0200 @@ -1,0 +2,6 @@ +Tue Jun 12 11:12:00 UTC 2018 - [email protected] + +- Add qsyncthingtray-fix-qt-cmake.patch: Fix Qt 5.11 CMake + compatibility. + +------------------------------------------------------------------- New: ---- qsyncthingtray-fix-qt-cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qsyncthingtray.spec ++++++ --- /var/tmp/diff_new_pack.CRlycg/_old 2018-06-19 11:56:20.998324677 +0200 +++ /var/tmp/diff_new_pack.CRlycg/_new 2018-06-19 11:56:21.002324528 +0200 @@ -1,7 +1,7 @@ # # spec file for package qsyncthingtray # -# 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 @@ -21,12 +21,14 @@ Version: 0.5.8 Release: 0 Summary: Qt-based Traybar Application for Syncthing -License: LGPL-3.0+ and GPL-3.0+ +License: LGPL-3.0-or-later AND GPL-3.0-or-later Group: Productivity/Networking/File-Sharing -Url: https://github.com/sieren/QSyncthingTray +URL: https://github.com/sieren/QSyncthingTray Source: https://github.com/sieren/QSyncthingTray/archive/%{version}.tar.gz#/%{_name}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.appdata.xml +# PATCH-FIX-OPENSUSE qsyncthingtray-fix-qt-cmake.patch -- Fix Qt 5.11 CMake compatibility. +Patch0: qsyncthingtray-fix-qt-cmake.patch BuildRequires: ImageMagick BuildRequires: cmake BuildRequires: hicolor-icon-theme @@ -39,7 +41,7 @@ BuildRequires: pkgconfig(Qt5Widgets) >= 5.6 Requires: syncthing Recommends: syncthing-inotify -%if 0%{?suse_version} > 1320 || (0%{?sle_version} > 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} > 120200 && 0%{?is_opensuse}) BuildRequires: pkgconfig(Qt5WebEngineWidgets) >= 5.6 %else BuildRequires: pkgconfig(Qt5WebKitWidgets) >= 5.6 @@ -64,13 +66,14 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 cp %{SOURCE1} %{name}.desktop cp %{SOURCE2} %{name}.appdata.xml sed -i 's|%{_prefix}/local|%{_prefix}|g' includes/platforms/linux/posixUtils.hpp %build %cmake \ -%if 0%{?suse_version} > 1320 || (0%{?sle_version} > 120200 && 0%{?is_opensuse}) +%if 0%{?suse_version} >= 1500 || (0%{?sle_version} > 120200 && 0%{?is_opensuse}) -DQST_BUILD_WEBKIT=OFF %else -DQST_BUILD_WEBKIT=ON @@ -92,6 +95,7 @@ %suse_update_desktop_file %{name} +%if 0%{?suse_version} < 1500 %post %desktop_database_post %icon_theme_cache_post @@ -99,10 +103,15 @@ %postun %desktop_database_postun %icon_theme_cache_postun +%endif %files -%defattr(-,root,root) -%doc LICENSE.txt COPYING.GPLv3+.txt README.md +%if 0%{?suse_version} >= 1500 +%license COPYING.GPLv3+.txt LICENSE.txt +%else +%doc COPYING.GPLv3+.txt LICENSE.txt +%endif +%doc README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* ++++++ qsyncthingtray-fix-qt-cmake.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,10 +125,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows endif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${QST_BUILD_WEBKIT}) - qt5_use_modules(QSyncthingTray Widgets Network WebKitWidgets) + find_package(Qt5 COMPONENTS WebKitWidgets) + target_link_libraries(QSyncthingTray Qt5::Widgets Qt5::Network Qt5::WebKitWidgets) target_compile_definitions(QSyncthingTray PRIVATE BUILD_WEBKIT=1) else() - qt5_use_modules(QSyncthingTray Widgets Network WebEngineWidgets) + find_package(Qt5 COMPONENTS WebEngineWidgets) + target_link_libraries(QSyncthingTray Qt5::Widgets Qt5::Network Qt5::WebEngineWidgets) endif()
