Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qtkeychain-qt5 for openSUSE:Factory checked in at 2022-02-03 23:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qtkeychain-qt5 (Old) and /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtkeychain-qt5" Thu Feb 3 23:15:43 2022 rev:12 rq:950677 version:0.13.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qtkeychain-qt5/qtkeychain-qt5.changes 2021-12-13 20:45:49.720495606 +0100 +++ /work/SRC/openSUSE:Factory/.qtkeychain-qt5.new.1898/qtkeychain-qt5.changes 2022-02-03 23:15:54.528849358 +0100 @@ -1,0 +2,11 @@ +Wed Feb 2 08:14:49 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Add patch to restore compatibility with CMake 3.16: + * 0001-Define-a-poper-exported-CMake-target-instead-of-intr.patch + +------------------------------------------------------------------- +Tue Dec 14 16:35:58 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Fix qtkeychain users on Leap. + +------------------------------------------------------------------- New: ---- 0001-Define-a-poper-exported-CMake-target-instead-of-intr.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtkeychain-qt5.spec ++++++ --- /var/tmp/diff_new_pack.irxGcw/_old 2022-02-03 23:15:55.236844525 +0100 +++ /var/tmp/diff_new_pack.irxGcw/_new 2022-02-03 23:15:55.244844471 +0100 @@ -1,7 +1,7 @@ # # spec file for package qtkeychain-qt5 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,8 @@ Group: Development/Libraries/C and C++ URL: https://github.com/frankosterfeld/qtkeychain Source: https://github.com/frankosterfeld/qtkeychain/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Define-a-poper-exported-CMake-target-instead-of-intr.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: cmake(Qt5Core) @@ -60,7 +62,7 @@ %build %cmake -DBUILD_TEST_APPLICATION=OFF .. -%make_jobs +%cmake_build %install %cmake_install ++++++ qtkeychain-qt6.spec ++++++ --- /var/tmp/diff_new_pack.irxGcw/_old 2022-02-03 23:15:55.264844334 +0100 +++ /var/tmp/diff_new_pack.irxGcw/_new 2022-02-03 23:15:55.268844307 +0100 @@ -1,7 +1,7 @@ # # spec file for package qtkeychain-qt6 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,6 +24,8 @@ License: BSD-2-Clause URL: https://github.com/frankosterfeld/qtkeychain Source: https://github.com/frankosterfeld/qtkeychain/archive/v%{version}.tar.gz#/qtkeychain-qt5-%{version}.tar.gz +# PATCH-FIX-UPSTREAM +Patch0: 0001-Define-a-poper-exported-CMake-target-instead-of-intr.patch BuildRequires: pkgconfig BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6DBus) ++++++ 0001-Define-a-poper-exported-CMake-target-instead-of-intr.patch ++++++ >From e5eeb1763e295f6b05a3f008ee7ae192fd74ed0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <[email protected]> Date: Tue, 25 Jan 2022 21:13:43 +0100 Subject: [PATCH] Define a poper exported CMake target instead of introducing an alias. This fixes building with cmake < version 18 a regression form 70a567abc59d11d2b1c87fcb8b7763365b3a5365 issue #209 --- QtKeychainConfig.cmake.in | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/QtKeychainConfig.cmake.in b/QtKeychainConfig.cmake.in index d849ded..41abb0e 100644 --- a/QtKeychainConfig.cmake.in +++ b/QtKeychainConfig.cmake.in @@ -18,7 +18,13 @@ if(UNIX AND NOT APPLE AND NOT ANDROID) find_dependency(Qt@QTKEYCHAIN_VERSION_INFIX@DBus) endif() -set(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@") +get_target_property(QTKEYCHAIN_LIBRARIES "@QTKEYCHAIN_TARGET_NAME@" LOCATION) get_target_property(QTKEYCHAIN_INCLUDE_DIRS "@QTKEYCHAIN_TARGET_NAME@" INTERFACE_INCLUDE_DIRECTORIES) -add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain ALIAS qt@QTKEYCHAIN_VERSION_INFIX@keychain) +if(NOT TARGET Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain) + add_library(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain UNKNOWN IMPORTED) + set_target_properties(Qt@QTKEYCHAIN_VERSION_INFIX@Keychain::Qt@QTKEYCHAIN_VERSION_INFIX@Keychain PROPERTIES + IMPORTED_LOCATION "${QTKEYCHAIN_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${QTKEYCHAIN_INCLUDE_DIRS}" + ) +endif() -- 2.34.1
