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 2023-05-13 17:17:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yaml-cpp (Old) and /work/SRC/openSUSE:Factory/.yaml-cpp.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yaml-cpp" Sat May 13 17:17:17 2023 rev:17 rq:1086725 version:0.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yaml-cpp/yaml-cpp.changes 2022-01-07 12:45:06.315792295 +0100 +++ /work/SRC/openSUSE:Factory/.yaml-cpp.new.1533/yaml-cpp.changes 2023-05-13 17:17:26.486312128 +0200 @@ -1,0 +2,7 @@ +Thu May 11 15:57:44 UTC 2023 - Frederic Crozat <[email protected]> + +- Drop patches fix-cmake-export.patch untabify-cmakelists.patch + replacing them with pull-request 1077.patch which was + merged (bsc#1191137). + +------------------------------------------------------------------- Old: ---- fix-cmake-export.patch untabify-cmakelists.patch New: ---- 1077.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yaml-cpp.spec ++++++ --- /var/tmp/diff_new_pack.vuY6mq/_old 2023-05-13 17:17:26.982314982 +0200 +++ /var/tmp/diff_new_pack.vuY6mq/_new 2023-05-13 17:17:26.990315028 +0200 @@ -1,7 +1,7 @@ # # spec file for package yaml-cpp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,7 @@ 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 -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 +Patch1: https://github.com/jbeder/yaml-cpp/pull/1077.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: sed ++++++ fix-cmake-export.patch -> 1077.patch ++++++ --- /work/SRC/openSUSE:Factory/yaml-cpp/fix-cmake-export.patch 2022-01-07 12:45:05.959792048 +0100 +++ /work/SRC/openSUSE:Factory/.yaml-cpp.new.1533/1077.patch 2023-05-13 17:17:26.450311921 +0200 @@ -1,7 +1,61 @@ +From a339bea6bb7bd461a41e874f78b46a5af98277ff Mon Sep 17 00:00:00 2001 +From: Felix <[email protected]> +Date: Thu, 30 Dec 2021 12:53:31 +0100 +Subject: [PATCH 1/2] 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 f65efefab..6adbf45a2 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) + From c1f987850a6282435f499bee76b12e32d7472f12 Mon Sep 17 00:00:00 2001 From: Felix <[email protected]> Date: Thu, 30 Dec 2021 15:35:54 +0100 -Subject: [PATCH] fix cmake export +Subject: [PATCH 2/2] 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).
