Make yaml-cpp compatible with boost 1.67+

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -3,4 +3,3 @@ yaml-cpp-0.2.5.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

sources

@@ -1 +1 @@
-64200ca0bf5e0af065804d8d3e8f6d42  yaml-cpp-0.5.3.tar.gz
+0fa47a5ed8fedefab766592785c85ee7  yaml-cpp-0.5.1.tar.gz

yaml-cpp-boost-1.67.diff

@@ -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
+ {

yaml-cpp.spec

@@ -1,12 +1,16 @@
 Name:           yaml-cpp
-Version:        0.5.3
+Epoch:          1
-Release:        7%{?dist}
+Version:        0.5.1
+Release:        2%{?dist}
 Summary:        A YAML parser and emitter for C++
 Group:          Development/Libraries
-License:        MIT 
+License:        MIT
-URL:            https://github.com/jbeder/yaml-cpp
+URL:            http://code.google.com/p/yaml-cpp/
-Source0:        https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz
+Source0:        http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz
-BuildRequires:  cmake gcc-c++
+# Make yaml-cpp compatible with boost 1.67+
+Patch1:         yaml-cpp-boost-1.67.diff
+
+BuildRequires:  cmake
 BuildRequires:  boost-devel
 
 %description
@@ -17,7 +21,7 @@ yaml-cpp is a YAML parser and emitter in C++ written around the YAML 1.2 spec.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 License:        MIT
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       pkgconfig
 Requires:       boost-devel
 
@@ -25,19 +29,53 @@ Requires:       boost-devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        static
+Summary:        Static library for %{name}
+Group:          Development/Libraries
+License:        MIT
+Requires:       %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description    static
+The %{name}-static package contains the static library for %{name}.
+
 
 %prep
-%setup -qn %{name}-release-%{version}
+%autosetup -p1
+# Fix eol
+sed -i 's/\r//' license.txt
 
 
 %build
-# ask cmake to not strip binaries
+### Build shared libraries
-%cmake . -DYAML_CPP_BUILD_TOOLS=0
+mkdir build-shared
-make VERBOSE=1 %{?_smp_mflags}
+pushd build-shared
+    # ask cmake to not strip binaries
+    %cmake -DYAML_CPP_BUILD_TOOLS=0 \
+           -DBUILD_SHARED_LIBS=ON \
+           ../
+    %make_build
+popd
+
+### Build static libraries
+mkdir build-static
+pushd build-static
+    # ask cmake to not strip binaries
+    %cmake -DYAML_CPP_BUILD_TOOLS=0 \
+           -DBUILD_SHARED_LIBS=OFF \
+           -DYAML_CPP_BUILD_CONTRIB=OFF \
+           ../
+    %make_build
+popd
 
 
 %install
-%make_install
+pushd build-shared
+    %make_install
+popd
+
+pushd build-static
+    %make_install
+popd
 
 
 %post -p /sbin/ldconfig
@@ -46,8 +84,7 @@ make VERBOSE=1 %{?_smp_mflags}
 
 
 %files
-%doc CONTRIBUTING.md README.md
+%doc license.txt
-%license LICENSE
 %{_libdir}/*.so.*
 
 %files devel
@@ -55,46 +92,18 @@ make VERBOSE=1 %{?_smp_mflags}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files static
+%license license.txt
+%{_libdir}/*.a
+
 
 %changelog
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
+* Wed Jul 24 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:0.5.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+- Make yaml-cpp compatible with boost 1.67+
 
-* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 0.5.3-6
+* Sun Jan 28 2018 Richard Shaw <hobbes1069@gmail.com> - 1:0.5.1-1
-- Rebuilt for s390x binutils bug
+- Revert epel7 branch back to 0.5.1.
-
+- Add static library package.
-* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 0.5.3-5
-- Rebuilt for Boost 1.64
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.5.3-3
-- Rebuilt for Boost 1.63
-
-* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.5.3-2
-- Rebuilt for Boost 1.63
-
-* Tue Aug 23 2016 Richard Shaw <hobbes1069@gmail.com> - 0.5.3-1
-- Update to latest upstream release.
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 0.5.1-12
-- Rebuilt for Boost 1.60
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.5.1-11
-- Rebuilt for Boost 1.59
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.5.1-9
-- rebuild for Boost 1.58
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.5.1-7
 - Rebuilt for GCC 5 C++11 ABI change