Hello community, here is the log from the commit of package websocketpp for openSUSE:Factory checked in at 2020-11-04 18:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/websocketpp (Old) and /work/SRC/openSUSE:Factory/.websocketpp.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "websocketpp" Wed Nov 4 18:26:55 2020 rev:12 rq:845788 version:0.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/websocketpp/websocketpp.changes 2020-08-20 22:34:54.420151892 +0200 +++ /work/SRC/openSUSE:Factory/.websocketpp.new.11331/websocketpp.changes 2020-11-04 18:31:58.312203635 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 08:44:13 UTC 2020 - Wolfgang Bauer <wba...@tmo.at> + +- Add Update-websocketpp-configVersion.cmake.patch to fix noarch + violations and make the package really noarch again + +------------------------------------------------------------------- New: ---- Update-websocketpp-configVersion.cmake.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ websocketpp.spec ++++++ --- /var/tmp/diff_new_pack.ICJjoD/_old 2020-11-04 18:31:58.820202508 +0100 +++ /var/tmp/diff_new_pack.ICJjoD/_new 2020-11-04 18:31:58.824202500 +0100 @@ -1,7 +1,7 @@ # # spec file for package websocketpp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,8 @@ URL: http://www.zaphoyd.com/websocketpp Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: websocketpp.pc +# PATCH-FIX-UPSTREAM - https://github.com/zaphoyd/websocketpp/pull/888 +Patch0: Update-websocketpp-configVersion.cmake.patch BuildRequires: cmake >= 2.6 BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -55,6 +57,7 @@ %prep %setup -q +%patch0 -p1 %build %if 0%{?suse_version} >= 1310 ++++++ Update-websocketpp-configVersion.cmake.patch ++++++ >From bdc3895f330f10bfbef1079417c023d4f4157673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= <c72...@yahoo.de> Date: Fri, 1 May 2020 14:39:31 +0200 Subject: [PATCH] Update websocketpp-configVersion.cmake - Disable check for same 32/64bit-ness. Use the ARCH_INDEPENDENT option for CMake 3.14 and newer. - Use AnyNewerVersion instead of ExactVersion in order to increase compatibility. Otherwise cmake find_package will fail, if the version is not exactly the same. --- CMakeLists.txt | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bff3654e..198ffd93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,9 +272,20 @@ configure_package_config_file(websocketpp-config.cmake.in INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}" NO_CHECK_REQUIRED_COMPONENTS_MACRO ) -write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" - VERSION ${WEBSOCKETPP_VERSION} - COMPATIBILITY ExactVersion) +if (${CMAKE_VERSION} VERSION_LESS "3.14.0") + # Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P + set (CMAKE_SIZEOF_VOID_P "") + write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" + VERSION ${WEBSOCKETPP_VERSION} + COMPATIBILITY AnyNewerVersion) +else () + # Use ARCH_INDEPENDENT option introduced in CMake 3.14 + # ARCH_INDEPENDENT is intended for header-only libraries or similar packages with no binaries + write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" + VERSION ${WEBSOCKETPP_VERSION} + COMPATIBILITY AnyNewerVersion + ARCH_INDEPENDENT) +endif () # Install the websocketpp-config.cmake and websocketpp-configVersion.cmake install (FILES
