Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yaml-cpp for openSUSE:Factory checked in at 2022-01-07 12:44:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yaml-cpp (Old) and /work/SRC/openSUSE:Factory/.yaml-cpp.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yaml-cpp" Fri Jan 7 12:44:38 2022 rev:16 rq:943831 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yaml-cpp/yaml-cpp.changes 2020-01-02 14:42:47.872946330 +0100 +++ /work/SRC/openSUSE:Factory/.yaml-cpp.new.1896/yaml-cpp.changes 2022-01-07 12:45:06.315792295 +0100 @@ -1,0 +2,20 @@ +Tue Jan 4 17:56:42 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- add fix-cmake-export.patch untabify-cmakelists.patch (bsc#1191137) + +------------------------------------------------------------------- +Mon Aug 30 18:47:21 UTC 2021 - Hans-Peter Jansen <h...@urpla.net> + +- Adjust library dependency reference + +------------------------------------------------------------------- +Mon Aug 30 16:14:47 UTC 2021 - Stanislav Brabec <sbra...@suse.com> + +- Update to 0.7.0: + * Bazel support + * CMake improvements + * Adopts many modern C++ syntaxes + * Bug fixes + * Obsoletes yaml-cpp-CVE-2017-5950.patch (fixed by DepthGuard) + +------------------------------------------------------------------- Old: ---- yaml-cpp-0.6.3.tar.gz yaml-cpp-CVE-2017-5950.patch New: ---- fix-cmake-export.patch untabify-cmakelists.patch yaml-cpp-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yaml-cpp.spec ++++++ --- /var/tmp/diff_new_pack.vnzPTy/_old 2022-01-07 12:45:07.311792987 +0100 +++ /var/tmp/diff_new_pack.vnzPTy/_new 2022-01-07 12:45:07.319792992 +0100 @@ -1,7 +1,7 @@ # # spec file for package yaml-cpp # -# Copyright (c) 2020 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 @@ -16,17 +16,17 @@ # -%define library_name libyaml-cpp0_6 +%define library_name libyaml-cpp0_7 Name: yaml-cpp -Version: 0.6.3 +Version: 0.7.0 Release: 0 Summary: YAML parser and emitter in C++ License: MIT Group: Development/Libraries/C and C++ URL: https://github.com/jbeder/yaml-cpp/ Source: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM bsc#1032144 CVE-2017-5950 Stack overflow in SingleDocParser::HandleNode() -Patch0: yaml-cpp-CVE-2017-5950.patch +Patch1: https://github.com/felix2010/yaml-cpp/commit/a339bea6bb7bd461a41e874f78b46a5af98277ff.patch#/untabify-cmakelists.patch +Patch2: https://github.com/felix2010/yaml-cpp/commit/c1f987850a6282435f499bee76b12e32d7472f12.patch#/fix-cmake-export.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: sed @@ -85,9 +85,9 @@ %{_libdir}/libyaml-cpp.so.* %files devel +%{_datadir}/pkgconfig/yaml-cpp.pc +%{_datadir}/cmake/%{name}/ %{_includedir}/yaml-cpp/ %{_libdir}/libyaml-cpp.so -%{_libdir}/pkgconfig/yaml-cpp.pc -%{_libdir}/cmake/%{name}/ %changelog ++++++ fix-cmake-export.patch ++++++ >From c1f987850a6282435f499bee76b12e32d7472f12 Mon Sep 17 00:00:00 2001 From: Felix <flx107...@gmail.com> Date: Thu, 30 Dec 2021 15:35:54 +0100 Subject: [PATCH] fix cmake export After configure the file `yaml-cpp-config.cmake.in` the result ends up with empty variables. (see also the discussion in #774). Rework this file and the call to `configure_package_config_file` according the cmake documentation (https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file) to overcome this issue and allow a simple `find_package` after install. As there was some discussion about the place where to install the `yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into an extra variable to make it easier changing this location in the future. --- CMakeLists.txt | 17 ++++++++++++----- yaml-cpp-config.cmake.in | 10 ++++++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6adbf45a2..e9310792e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,10 +129,16 @@ set_target_properties(yaml-cpp PROPERTIES PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") +# FIXME(felix2012): A more common place for the cmake export would be +# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest +set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") +set(EXPORT_TARGETS yaml-cpp) configure_package_config_file( "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") + INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" + PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR) +unset(EXPORT_TARGETS) write_basic_package_version_file( "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" @@ -150,14 +156,15 @@ if (YAML_CPP_INSTALL) DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} FILES_MATCHING PATTERN "*.h") install(EXPORT yaml-cpp-targets - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") + DESTINATION "${CONFIG_EXPORT_DIR}") install(FILES - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" - DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" + DESTINATION "${CONFIG_EXPORT_DIR}") install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) endif() +unset(CONFIG_EXPORT_DIR) if(YAML_CPP_BUILD_TESTS) add_subdirectory(test) diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in index 7b41e3f30..a7ace3dc0 100644 --- a/yaml-cpp-config.cmake.in +++ b/yaml-cpp-config.cmake.in @@ -3,12 +3,14 @@ # YAML_CPP_INCLUDE_DIR - include directory # YAML_CPP_LIBRARIES - libraries to link against -# Compute paths -get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) -set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") +@PACKAGE_INIT@ + +set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") # Our library dependencies (contains definitions for IMPORTED targets) -include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") +include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) # These are IMPORTED targets created by yaml-cpp-targets.cmake set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") + +check_required_components(@EXPORT_TARGETS@) ++++++ untabify-cmakelists.patch ++++++ >From a339bea6bb7bd461a41e874f78b46a5af98277ff Mon Sep 17 00:00:00 2001 From: Felix <flx107...@gmail.com> Date: Thu, 30 Dec 2021 12:53:31 +0100 Subject: [PATCH] untabify CMakeLists.txt in some places This is to align with the other code parts in this file. --- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f65efefa..6adbf45a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,30 +141,30 @@ write_basic_package_version_file( configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) if (YAML_CPP_INSTALL) - install(TARGETS yaml-cpp + install(TARGETS yaml-cpp EXPORT yaml-cpp-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ + install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - FILES_MATCHING PATTERN "*.h") + FILES_MATCHING PATTERN "*.h") install(EXPORT yaml-cpp-targets DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") - install(FILES - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" + install(FILES + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) endif() if(YAML_CPP_BUILD_TESTS) - add_subdirectory(test) + add_subdirectory(test) endif() if(YAML_CPP_BUILD_TOOLS) - add_subdirectory(util) + add_subdirectory(util) endif() if (YAML_CPP_CLANG_FORMAT_EXE) ++++++ yaml-cpp-0.6.3.tar.gz -> yaml-cpp-0.7.0.tar.gz ++++++ ++++ 280965 lines of diff (skipped)
