yaml-cpp: Update from 0.7.0 to 0.8.0 in Mariner 3.0 (#7540)

Co-authored-by: Sharath Srikanth Chellappa <sharathsr@microsoft.com>
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
This commit is contained in:
sharath-srikanth-chellappa 2024-01-31 08:50:00 -08:00 коммит произвёл GitHub
Родитель a3c06e6045
Коммит d0886338f9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 16 добавлений и 21 удалений

Просмотреть файл

@ -1,11 +0,0 @@
--- a/yaml-cpp-config.cmake.in
+++ b/yaml-cpp-config.cmake.in
@@ -8,7 +8,7 @@ get_filename_component(YAML_CPP_CMAKE_DI
set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@")
# Our library dependencies (contains definitions for IMPORTED targets)
-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake")
+include("${YAML_CPP_CMAKE_DIR}/@YAML_TARGET@-targets.cmake")
# These are IMPORTED targets created by yaml-cpp-targets.cmake
set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@")

Просмотреть файл

@ -1,5 +1,5 @@
{ {
"Signatures": { "Signatures": {
"yaml-cpp-0.7.0.tar.gz": "43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3" "yaml-cpp-0.8.0.tar.gz": "fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16"
} }
} }

Просмотреть файл

@ -1,13 +1,12 @@
Summary: A YAML parser and emitter for C++ Summary: A YAML parser and emitter for C++
Name: yaml-cpp Name: yaml-cpp
Version: 0.7.0 Version: 0.8.0
Release: 1%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Vendor: Microsoft Corporation Vendor: Microsoft Corporation
Distribution: Mariner Distribution: Mariner
URL: https://github.com/jbeder/yaml-cpp URL: https://github.com/jbeder/yaml-cpp
Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz Source0: https://github.com/jbeder/yaml-cpp/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: yaml-cpp-static.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -31,7 +30,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
The %{name}-static package contains the static library for %{name}. The %{name}-static package contains the static library for %{name}.
%prep %prep
%autosetup -n %{name}-%{name}-%{version} %autosetup
%build %build
rm -rf build_shared && mkdir build_shared rm -rf build_shared && mkdir build_shared
@ -65,19 +64,26 @@ pushd build_static
%files %files
%doc CONTRIBUTING.md README.md %doc CONTRIBUTING.md README.md
%license LICENSE %license LICENSE
%{_libdir}/*.so.0.7* %{_libdir}/*.so.0.8*
%files devel %files devel
%{_includedir}/yaml-cpp/ %{_includedir}/yaml-cpp/
%{_libdir}/*.so %{_libdir}/*.so
%{_datadir}/cmake/%{name} %{_libdir}/cmake/%{name}
%{_datadir}/pkgconfig/%{name}.pc %{_libdir}/pkgconfig/%{name}.pc
%files static %files static
%license LICENSE %license LICENSE
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Tue Jan 23 2024 Sharath Srikanth Chellappa <sharathsr@microsoft.com> - 0.8.0-1
- Bump version to 0.8.0 from 0.7.0
- Removing patch SPECS/yaml-cpp/yaml-cpp-static.patch since the variable been replaced in 0.8.0 with commit hash 4aad2b1 in PR#1077
- Modifying name of folder to move from %{name}-%{name}-%{version} to %{name}-%{version}
- Updating the .so files from 0.7* to 0.8*
- Changing directories of cmake/yaml-cpp and pkgconfig/yaml-cpp.pc files since they are created under /usr/lib in this version
* Wed Jan 26 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 0.7.0-1 * Wed Jan 26 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 0.7.0-1
- Update to version 0.7.0. - Update to version 0.7.0.
- License verified. - License verified.

Просмотреть файл

@ -30280,8 +30280,8 @@
"type": "other", "type": "other",
"other": { "other": {
"name": "yaml-cpp", "name": "yaml-cpp",
"version": "0.7.0", "version": "0.8.0",
"downloadUrl": "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.7.0.tar.gz" "downloadUrl": "https://github.com/jbeder/yaml-cpp/archive/refs/tags/0.8.0.tar.gz"
} }
} }
}, },