#1 Make yaml-cpp compatible with boost 1.67+
Merged 4 years ago by hobbes1069. Opened 4 years ago by ignatenkobrain.
rpms/ ignatenkobrain/yaml-cpp upgrade  into  epel7

@@ -0,0 +1,11 @@ 

+ diff -uNr yaml-cpp-0.5.1.orig/include/yaml-cpp/node/detail/iterator.h yaml-cpp-0.5.1/include/yaml-cpp/node/detail/iterator.h

+ --- yaml-cpp-0.5.1.orig/include/yaml-cpp/node/detail/iterator.h	2013-04-14 01:37:53.000000000 +0200

+ +++ yaml-cpp-0.5.1/include/yaml-cpp/node/detail/iterator.h	2019-07-24 15:23:47.333647517 +0200

+ @@ -11,6 +11,7 @@

+  #include "yaml-cpp/node/detail/node_iterator.h"

+  #include <boost/iterator/iterator_adaptor.hpp>

+  #include <boost/utility.hpp>

+ +#include <boost/next_prior.hpp>

+  

+  namespace YAML

+  {

file modified
+9 -4
@@ -1,12 +1,14 @@ 

  Name:           yaml-cpp

  Epoch:          1

  Version:        0.5.1

- Release:        1%{?dist}.2

+ Release:        2%{?dist}

  Summary:        A YAML parser and emitter for C++

  Group:          Development/Libraries

- License:        MIT 

+ License:        MIT

  URL:            http://code.google.com/p/yaml-cpp/

  Source0:        http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz

+ # Make yaml-cpp compatible with boost 1.67+

+ Patch1:         yaml-cpp-boost-1.67.diff

  

  BuildRequires:  cmake

  BuildRequires:  boost-devel
@@ -38,8 +40,8 @@ 

  

  

  %prep

- %autosetup

- # Fix eol 

+ %autosetup -p1

+ # Fix eol

  sed -i 's/\r//' license.txt

  

  
@@ -96,6 +98,9 @@ 

  

  

  %changelog

+ * Wed Jul 24 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.5.1-2

+ - Make yaml-cpp compatible with boost 1.67+

+ 

  * Sun Jan 28 2018 Richard Shaw <hobbes1069@gmail.com> - 1:0.5.1-1

  - Revert epel7 branch back to 0.5.1.

  - Add static library package.

Looks pretty straightforward to me. Should it be applied to all released branches?

Only epel7 is fine for me.

Pull-Request has been merged by hobbes1069

4 years ago