From 01ff4c557bb0787b8145be540681958001af53e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:27:21 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 90f6971..32e4e29 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Apr 19 2023 Vitaly Zaitsev - 0.7.0-3 - Fixed broken CMake configs (rhbz#2188009). - Backported CMake fixes from upstream. From bf9f6b8f680766934e1e374da471e6c13c436b71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:39:01 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 32e4e29..44534d9 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3803a9aa5be4a8767583d67e4da2b6718be57fe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:38:16 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 44534d9..5108133 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.7.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -87,6 +87,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.7.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.7.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5e5009298fa904f80daee2304b3822e5c5c1f726 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 21 Oct 2024 20:42:02 -0600 Subject: [PATCH 04/11] Update to 0.8.0 --- .gitignore | 1 + sources | 2 +- yaml-cpp-cmake.patch | 245 ------------------------------------------- yaml-cpp.spec | 18 ++-- 4 files changed, 11 insertions(+), 255 deletions(-) delete mode 100644 yaml-cpp-cmake.patch diff --git a/.gitignore b/.gitignore index b7bc3bf..8721528 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.6.2.tar.gz /yaml-cpp-0.6.3.tar.gz /yaml-cpp-0.7.0.tar.gz +/yaml-cpp-0.8.0.tar.gz diff --git a/sources b/sources index a73bbfa..8cdbf36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.7.0.tar.gz) = 2de0f0ec8f003cd3c498d571cda7a796bf220517bad2dc02cba70c522dddde398f33cf1ad20da251adaacb2a07b77844111f297e99d45a7c46ebc01706bbafb5 +SHA512 (yaml-cpp-0.8.0.tar.gz) = aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e diff --git a/yaml-cpp-cmake.patch b/yaml-cpp-cmake.patch deleted file mode 100644 index 218484c..0000000 --- a/yaml-cpp-cmake.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b230b9e..6ef6e8a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,33 +9,39 @@ endif() - - project(YAML_CPP VERSION 0.7.0 LANGUAGES CXX) - -+set(YAML_CPP_MAIN_PROJECT OFF) -+if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) -+ set(YAML_CPP_MAIN_PROJECT ON) -+endif() -+ - include(CMakePackageConfigHelpers) - include(CMakeDependentOption) - include(CheckCXXCompilerFlag) - include(GNUInstallDirs) - include(CTest) - --find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) -- - option(YAML_CPP_BUILD_CONTRIB "Enable yaml-cpp contrib in library" ON) - option(YAML_CPP_BUILD_TOOLS "Enable parse tools" ON) - option(YAML_BUILD_SHARED_LIBS "Build yaml-cpp shared library" ${BUILD_SHARED_LIBS}) -- -+option(YAML_CPP_INSTALL "Enable generation of yaml-cpp install targets" ${YAML_CPP_MAIN_PROJECT}) -+option(YAML_CPP_FORMAT_SOURCE "Format source" ON) - cmake_dependent_option(YAML_CPP_BUILD_TESTS -- "Enable yaml-cpp tests" ON -- "BUILD_TESTING;CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) --cmake_dependent_option(YAML_CPP_INSTALL -- "Enable generation of yaml-cpp install targets" ON -- "CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR" OFF) -+ "Enable yaml-cpp tests" OFF -+ "BUILD_TESTING;YAML_CPP_MAIN_PROJECT" OFF) - cmake_dependent_option(YAML_MSVC_SHARED_RT - "MSVC: Build yaml-cpp with shared runtime libs (/MD)" ON -- "MSVC" OFF) -+ "CMAKE_SYSTEM_NAME MATCHES Windows" OFF) -+ -+if (YAML_CPP_FORMAT_SOURCE) -+ find_program(YAML_CPP_CLANG_FORMAT_EXE NAMES clang-format) -+endif() - --set(yaml-cpp-type STATIC) --set(yaml-cpp-label-postfix "static") - if (YAML_BUILD_SHARED_LIBS) - set(yaml-cpp-type SHARED) - set(yaml-cpp-label-postfix "shared") -+else() -+ set(yaml-cpp-type STATIC) -+ set(yaml-cpp-label-postfix "static") - endif() - - set(build-shared $) -@@ -78,6 +84,10 @@ set_property(TARGET yaml-cpp - PROPERTY - CXX_STANDARD_REQUIRED ON) - -+if (NOT YAML_BUILD_SHARED_LIBS) -+ set_property(TARGET yaml-cpp PROPERTY POSITION_INDEPENDENT_CODE ON) -+endif() -+ - target_include_directories(yaml-cpp - PUBLIC - $ -@@ -91,11 +101,15 @@ if (NOT DEFINED CMAKE_CXX_STANDARD) - CXX_STANDARD 11) - endif() - -+if(YAML_CPP_MAIN_PROJECT) -+ target_compile_options(yaml-cpp -+ PRIVATE -+ $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> -+ $<${not-msvc}:-pedantic -pedantic-errors>) -+endif() -+ - target_compile_options(yaml-cpp - PRIVATE -- $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> -- $<${not-msvc}:-pedantic -pedantic-errors> -- - $<$:-MTd> - $<$:-MT> - $<$:-MDd> -@@ -108,6 +122,8 @@ target_compile_options(yaml-cpp - $<$:/W3 /wd4127 /wd4355>) - - target_compile_definitions(yaml-cpp -+ PUBLIC -+ $<$>:YAML_CPP_STATIC_DEFINE> - PRIVATE - $<${build-windows-dll}:${PROJECT_NAME}_DLL> - $<$>:YAML_CPP_NO_CONTRIB>) -@@ -127,10 +143,14 @@ set_target_properties(yaml-cpp PROPERTIES - PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" - DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") - -+set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/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 CMAKE_INSTALL_LIBDIR CONFIG_EXPORT_DIR YAML_BUILD_SHARED_LIBS) -+unset(EXPORT_TARGETS) - - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" -@@ -139,36 +159,48 @@ 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" -- 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 "${CONFIG_EXPORT_DIR}") - install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" -- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - endif() -+unset(CONFIG_EXPORT_DIR) - - 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) -+if (YAML_CPP_FORMAT_SOURCE AND YAML_CPP_CLANG_FORMAT_EXE) - add_custom_target(format - COMMAND clang-format --style=file -i $ - COMMAND_EXPAND_LISTS - COMMENT "Running clang-format" - VERBATIM) - endif() -+ -+# uninstall target -+if(NOT TARGET uninstall) -+ configure_file( -+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" -+ IMMEDIATE @ONLY) -+ -+ add_custom_target(uninstall -+ COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) -+endif() -diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in -new file mode 100644 -index 0000000..c2d34d4 ---- /dev/null -+++ b/cmake_uninstall.cmake.in -@@ -0,0 +1,21 @@ -+if(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") -+ message(FATAL_ERROR "Cannot find install manifest: @CMAKE_BINARY_DIR@/install_manifest.txt") -+endif() -+ -+file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) -+string(REGEX REPLACE "\n" ";" files "${files}") -+foreach(file ${files}) -+ message(STATUS "Uninstalling $ENV{DESTDIR}${file}") -+ if(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") -+ exec_program( -+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\"" -+ OUTPUT_VARIABLE rm_out -+ RETURN_VALUE rm_retval -+ ) -+ if(NOT "${rm_retval}" STREQUAL 0) -+ message(FATAL_ERROR "Problem when removing $ENV{DESTDIR}${file}") -+ endif() -+ else(IS_SYMLINK "$ENV{DESTDIR}${file}" OR EXISTS "$ENV{DESTDIR}${file}") -+ message(STATUS "File $ENV{DESTDIR}${file} does not exist.") -+ endif() -+endforeach() -diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in -index 7b41e3f..799b9b4 100644 ---- a/yaml-cpp-config.cmake.in -+++ b/yaml-cpp-config.cmake.in -@@ -1,14 +1,22 @@ - # - Config file for the yaml-cpp package - # It defines the following variables --# YAML_CPP_INCLUDE_DIR - include directory --# YAML_CPP_LIBRARIES - libraries to link against -+# YAML_CPP_INCLUDE_DIR - include directory -+# YAML_CPP_LIBRARY_DIR - directory containing libraries -+# YAML_CPP_SHARED_LIBS_BUILT - whether we have built shared libraries or not -+# 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@") -+set_and_check(YAML_CPP_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+ -+# Are we building shared libraries? -+set(YAML_CPP_SHARED_LIBS_BUILT "@PACKAGE_YAML_BUILD_SHARED_LIBS@") - - # 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@) -diff --git a/yaml-cpp.pc.in b/yaml-cpp.pc.in -index f713de6..d02dc9e 100644 ---- a/yaml-cpp.pc.in -+++ b/yaml-cpp.pc.in -@@ -1,7 +1,7 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - - Name: Yaml-cpp - Description: A YAML parser and emitter for C++ diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 5108133..756aaef 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,16 +1,13 @@ -%global sover 0.7 +%global sover 0.8 Name: yaml-cpp -Version: 0.7.0 -Release: 6%{?dist} +Version: 0.8.0 +Release: 1%{?dist} License: MIT Summary: A YAML parser and emitter for C++ URL: https://github.com/jbeder/yaml-cpp -Source0: %{url}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz - -# CMake fixes from 0e6e28d1a38224fc8172fae0109ea7f673c096db commit -Patch100: yaml-cpp-cmake.patch +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc @@ -37,7 +34,7 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} The %{name}-static package contains the static library for %{name}. %prep -%autosetup -n %{name}-%{name}-%{version} -p1 +%autosetup -n %{name}-%{version} -p1 %build %cmake -B build_static \ @@ -72,7 +69,7 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %files %doc CONTRIBUTING.md README.md %license LICENSE -%{_libdir}/lib%{name}*.so.%{sover}* +%{_libdir}/lib%{name}.so.%{sover}* %files devel %{_includedir}/yaml-cpp/ @@ -87,6 +84,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Mon Oct 21 2024 Orion Poplawski - 0.8.0-1 +- Update to 0.8.0 + * Sat Jul 20 2024 Fedora Release Engineering - 0.7.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cb47231900c19f643975e40ea353cbae4c27f0b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:29:42 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 756aaef..d27e996 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -84,6 +84,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Oct 21 2024 Orion Poplawski - 0.8.0-1 - Update to 0.8.0 From af5d9fc11197ce7118c51bf75375e47535559d89 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 26 Jan 2025 16:15:01 -0600 Subject: [PATCH 06/11] Add patch for FTBFS, BZ#2341591. --- yaml-cpp-include.patch | 9 +++++++++ yaml-cpp.spec | 8 +++++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 yaml-cpp-include.patch diff --git a/yaml-cpp-include.patch b/yaml-cpp-include.patch new file mode 100644 index 0000000..b248543 --- /dev/null +++ b/yaml-cpp-include.patch @@ -0,0 +1,9 @@ +Index: yaml-cpp-0.8.0/src/emitterutils.cpp +=================================================================== +--- yaml-cpp-0.8.0.orig/src/emitterutils.cpp ++++ yaml-cpp-0.8.0/src/emitterutils.cpp +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d27e996..c71b4d7 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,12 +2,14 @@ Name: yaml-cpp Version: 0.8.0 -Release: 2%{?dist} +Release: 1%{?dist} License: MIT Summary: A YAML parser and emitter for C++ URL: https://github.com/jbeder/yaml-cpp -Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/jbeder/yaml-cpp/archive/%{version}/%{name}-%{version}.tar.gz + +Patch0: yaml-cpp-include.patch BuildRequires: cmake BuildRequires: gcc @@ -34,7 +36,7 @@ Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} The %{name}-static package contains the static library for %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 %build %cmake -B build_static \ From 887798d8dff693b0cd9be60d087844e7763edf23 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 26 Jan 2025 16:17:29 -0600 Subject: [PATCH 07/11] Added patch for FTBFS, BZ#2341591. Added patch for FTBFS, BZ#2341591. Added patch for FTBFS, BZ#2341591. --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index c71b4d7..2bcf1c6 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -86,6 +86,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sun Jan 26 2025 Richard Shaw - 0.8.0-2 +- Added patch for FTBFS, BZ#2341591. + * Sun Jan 19 2025 Fedora Release Engineering - 0.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 117550bab9f43c4a3b37ddd12c42fe1f1d5e136f Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Thu, 15 May 2025 11:53:01 +0200 Subject: [PATCH 08/11] Allow to build with CMake 4.0 --- 1211.patch | 29 +++++++++++++++++++++++++++++ yaml-cpp.spec | 30 ++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 1211.patch diff --git a/1211.patch b/1211.patch new file mode 100644 index 0000000..29085ab --- /dev/null +++ b/1211.patch @@ -0,0 +1,29 @@ +From 8153a1add19018f65527faad3c4d3941705baf39 Mon Sep 17 00:00:00 2001 +From: Craig Scott +Date: Wed, 16 Aug 2023 15:55:44 +1000 +Subject: [PATCH] Specify CMake policy range to avoid deprecation warning + +CMake 3.27 started issuing a deprecation warning for any +cmake_minimum_required() call that specified a minimum +version older than 3.5. Specifying a version range instead of +a simple minimum version avoids that warning without +raising the minimum supported CMake version. The NEW +policy behavior will be used for all policies introduced up to +CMake 3.14 with this change. +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 46dc18059..1ae92e2b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,6 @@ +-# 3.5 is actually available almost everywhere, but this a good minimum +-cmake_minimum_required(VERSION 3.4) ++# 3.5 is actually available almost everywhere, but this a good minimum. ++# 3.14 as the upper policy limit avoids CMake deprecation warnings. ++cmake_minimum_required(VERSION 3.4...3.14) + + # enable MSVC_RUNTIME_LIBRARY target property + # see https://cmake.org/cmake/help/latest/policy/CMP0091.html diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 2bcf1c6..d4d0a3d 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -11,10 +11,12 @@ Source0: https://github.com/jbeder/yaml-cpp/archive/%{version}/%{name}-%{ Patch0: yaml-cpp-include.patch +# Allow CMake 4.0 build +Patch1: https://github.com/jbeder/yaml-cpp/pull/1211.patch + BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: make %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. @@ -39,26 +41,34 @@ The %{name}-static package contains the static library for %{name}. %autosetup -p1 %build -%cmake -B build_static \ +# Define separate build directories for static and shared +%global _vpath_builddir %{_target_platform}-${variant} + +variant=static +%cmake \ -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ -DYAML_CPP_INSTALL:BOOL=ON \ -DYAML_BUILD_SHARED_LIBS:BOOL=OFF \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF -%make_build -C build_static -%cmake -B build_shared \ +variant=shared +%cmake \ -DCMAKE_BUILD_TYPE=Release \ -DYAML_CPP_BUILD_TOOLS:BOOL=OFF \ -DYAML_CPP_FORMAT_SOURCE:BOOL=OFF \ -DYAML_CPP_INSTALL:BOOL=ON \ -DYAML_BUILD_SHARED_LIBS:BOOL=ON \ -DYAML_CPP_BUILD_TESTS:BOOL=OFF -%make_build -C build_shared + +for variant in static shared; do + %cmake_build +done %install -%make_install -C build_static yaml-cpp +variant=static +%cmake_install # Move files so they don't get trampled mv %{buildroot}%{_libdir}/cmake/%{name} \ @@ -66,7 +76,8 @@ mv %{buildroot}%{_libdir}/cmake/%{name} \ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc -%make_install -C build_shared +variant=shared +%cmake_install %files %doc CONTRIBUTING.md README.md @@ -86,6 +97,9 @@ mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Thu May 15 2025 Cristian Le - 0.8.0-3 +- Allow to build with CMake 4.0 and Ninja generator + * Sun Jan 26 2025 Richard Shaw - 0.8.0-2 - Added patch for FTBFS, BZ#2341591. From 0a64fb057bf4da6da90c42bca27561a806a77636 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:10:15 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d4d0a3d..39a5770 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu May 15 2025 Cristian Le - 0.8.0-3 - Allow to build with CMake 4.0 and Ninja generator From 21474c78e94840ffa5f49c23571d9cfaee4c64e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:00:01 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 39a5770..4239bc3 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.8.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From db6c2dc0cd537bc9b9fe00f5b4f80f550d8560d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:32:30 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- yaml-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4239bc3..6234375 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -2,7 +2,7 @@ Name: yaml-cpp Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: MIT Summary: A YAML parser and emitter for C++ @@ -97,6 +97,9 @@ variant=shared %{_libdir}/pkgconfig/%{name}-static.pc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.8.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild