diff --git a/.gitignore b/.gitignore index 8721528..80cb5b1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,11 +2,3 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.6.tar.gz /yaml-cpp-0.2.7.tar.gz /yaml-cpp-0.3.0.tar.gz -/yaml-cpp-0.5.1.tar.gz -/yaml-cpp-0.5.3.tar.gz -/yaml-cpp-0.6.0.tar.gz -/yaml-cpp-0.6.1.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/1211.patch b/1211.patch deleted file mode 100644 index 29085ab..0000000 --- a/1211.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/sources b/sources index 8cdbf36..8453a58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yaml-cpp-0.8.0.tar.gz) = aae9d618f906117d620d63173e95572c738db518f4ff1901a06de2117d8deeb8045f554102ca0ba4735ac0c4d060153a938ef78da3e0da3406d27b8298e5f38e +9aa519205a543f9372bf4179071c8ac6 yaml-cpp-0.3.0.tar.gz diff --git a/yaml-cpp-include.patch b/yaml-cpp-include.patch deleted file mode 100644 index b248543..0000000 --- a/yaml-cpp-include.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 6234375..acbd820 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,274 +1,64 @@ -%global sover 0.8 - Name: yaml-cpp -Version: 0.8.0 -Release: 6%{?dist} - -License: MIT +Version: 0.3.0 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ -URL: https://github.com/jbeder/yaml-cpp -Source0: https://github.com/jbeder/yaml-cpp/archive/%{version}/%{name}-%{version}.tar.gz - -Patch0: yaml-cpp-include.patch - -# Allow CMake 4.0 build -Patch1: https://github.com/jbeder/yaml-cpp/pull/1211.patch +Group: Development/Libraries +License: MIT +URL: http://code.google.com/p/yaml-cpp/ +Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ + %description yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec. + %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libstdc++-devel%{?_isa} +Group: Development/Libraries +License: MIT +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package static -Summary: Static library for %{name} -Requires: %{name}-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description static -The %{name}-static package contains the static library for %{name}. %prep -%autosetup -p1 +%setup -q -n %{name} +# Fix eol +sed -i 's/\r//' license.txt + %build -# Define separate build directories for static and shared -%global _vpath_builddir %{_target_platform}-${variant} +# ask cmake to not strip binaries +%cmake . -DYAML_CPP_BUILD_TOOLS=0 +make VERBOSE=1 %{?_smp_mflags} -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 - -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 - -for variant in static shared; do - %cmake_build -done %install -variant=static -%cmake_install +make install DESTDIR=%{buildroot} +find %{buildroot} -name '*.la' -exec rm -f {} ';' -# Move files so they don't get trampled -mv %{buildroot}%{_libdir}/cmake/%{name} \ - %{buildroot}%{_libdir}/cmake/%{name}-static -mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \ - %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc -variant=shared -%cmake_install +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files -%doc CONTRIBUTING.md README.md -%license LICENSE -%{_libdir}/lib%{name}.so.%{sover}* +%doc license.txt +%{_libdir}/*.so.* %files devel %{_includedir}/yaml-cpp/ -%{_libdir}/lib%{name}.so -%{_libdir}/cmake/%{name} -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc -%files static -%license LICENSE -%{_libdir}/lib%{name}.a -%{_libdir}/cmake/%{name}-static -%{_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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Wed Apr 19 2023 Vitaly Zaitsev - 0.7.0-3 -- Fixed broken CMake configs (rhbz#2188009). -- Backported CMake fixes from upstream. -- Converted license tag to SPDX. -- Performed minor SPEC cleanup. - -* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 06 2022 Richard Shaw - 0.7.0-1 -- Update to 0.7.0. - -* Sat Jul 23 2022 Fedora Release Engineering - 0.6.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.6.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.6.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 0.6.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.6.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Oct 15 2019 Richard Shaw - 0.6.3-1 -- Update to 0.6.3. - -* Sat Jul 27 2019 Fedora Release Engineering - 0.6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Jun 09 2019 Till Hofmann - 0.6.2-2 -- Remove unused boost dependency - -* Sun Jun 09 2019 Till Hofmann - 0.6.2-1 -- Update to 0.6.2 - -* Sun Feb 03 2019 Fedora Release Engineering - 0.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 24 2019 Jonathan Wakely - 0.6.1-5 -- Rebuilt for Boost 1.69 - -* Sun Sep 16 2018 Richard Shaw - 0.6.1-4 -- Add patch for CVE-2017-5950. - -* Sat Jul 14 2018 Fedora Release Engineering - 0.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 09 2018 Richard Shaw - 0.6.1-2 -- Fixes improperly generated cmake config files, RHBZ#1558637. - -* Sun Feb 18 2018 Richard Shaw - 0.6.1-1 -- Update to 0.6.1. - -* Sun Feb 11 2018 Richard Shaw - 0.6.0-1 -- Update to 0.6.0. -- Add static library subpackage. - -* Fri Feb 09 2018 Fedora Release Engineering - 0.5.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Richard Shaw - 0.5.3-9 -- Install yaml cmake files, fixes RHBZ#1509421. - -* Tue Jan 23 2018 Jonathan Wakely - 0.5.3-8 -- Rebuilt for Boost 1.66 - -* Thu Jul 27 2017 Fedora Release Engineering - 0.5.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Jonathan Wakely - 0.5.3-6 -- Rebuilt for s390x binutils bug - -* Tue Jul 04 2017 Jonathan Wakely - 0.5.3-5 -- Rebuilt for Boost 1.64 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.5.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 -- Rebuilt for Boost 1.63 - -* Tue Aug 23 2016 Richard Shaw - 0.5.3-1 -- Update to latest upstream release. - -* Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 0.5.1-12 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.5.1-11 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.5.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.5.1-9 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 0.5.1-7 -- Rebuilt for GCC 5 C++11 ABI change - -* Thu Feb 26 2015 Guido Grazioli - 0.5.1-6 -- Rebuild for gcc switching default to -std=gnu11 - -* Tue Jan 27 2015 Petr Machata - 0.5.1-5 -- Rebuild for boost 1.57.0 - -* Mon Aug 18 2014 Fedora Release Engineering - 0.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri May 23 2014 Petr Machata - 0.5.1-2 -- Rebuild for boost 1.55.0 - -* Thu Nov 14 2013 Richard Shaw - 0.5.1-1 -- Update to latest upstream release. - -* Sun Aug 04 2013 Fedora Release Engineering - 0.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 15 2013 Fedora Release Engineering - 0.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - * Fri Feb 10 2012 Richard Shaw - 0.3.0-1 - Update to latest release.