From 5eefe9c85a504417633b88eed8151725ad54ac20 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: Mon, 9 May 2011 14:13:44 +0200 Subject: [PATCH] * Mon May 09 2011 Guido Grazioli - 0.2.6-1 - Upstream 0.2.6 --- .gitignore | 1 + 001_yaml-cpp_fixbuildgcc46.patch | 22 ++++++++++++++++++++++ sources | 2 +- yaml-cpp.spec | 14 ++++++++++---- 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 001_yaml-cpp_fixbuildgcc46.patch diff --git a/.gitignore b/.gitignore index 6d3463d..77055e9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ yaml-cpp-0.2.5.tar.gz +/yaml-cpp-0.2.6.tar.gz diff --git a/001_yaml-cpp_fixbuildgcc46.patch b/001_yaml-cpp_fixbuildgcc46.patch new file mode 100644 index 0000000..e5b6ad2 --- /dev/null +++ b/001_yaml-cpp_fixbuildgcc46.patch @@ -0,0 +1,22 @@ +diff -ru yaml-cpp-0.2.6//src/ptr_stack.h yaml-cpp//src/ptr_stack.h +--- a/src/ptr_stack.h 2011-03-03 09:11:14.000000000 +0100 ++++ b/src/ptr_stack.h 2011-05-09 13:59:18.039965165 +0200 +@@ -8,6 +8,7 @@ + #include "yaml-cpp/noncopyable.h" + #include + #include ++#include + + template + class ptr_stack: private YAML::noncopyable +diff -ru yaml-cpp-0.2.6//src/ptr_vector.h yaml-cpp//src/ptr_vector.h +--- a/src/ptr_vector.h 2011-03-16 02:13:41.000000000 +0100 ++++ b/src/ptr_vector.h 2011-05-09 13:58:46.607892700 +0200 +@@ -8,6 +8,7 @@ + #include "yaml-cpp/noncopyable.h" + #include + #include ++#include + + namespace YAML { + diff --git a/sources b/sources index f0c37bf..643253b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b17dc36055cd2259c88b2602601415d9 yaml-cpp-0.2.5.tar.gz +ddfa5e8d409d9dafbeb6d190cd68dbcb yaml-cpp-0.2.6.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index e45f02b..4ab9fed 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,11 +1,13 @@ Name: yaml-cpp -Version: 0.2.5 -Release: 2%{?dist} +Version: 0.2.6 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT URL: http://code.google.com/p/yaml-cpp/ Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz +# fix build with g++ 4.6; notified upstream +Patch0: 001_yaml-cpp_fixbuildgcc46.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -26,14 +28,15 @@ developing applications that use %{name}. %prep -%setup -q +%setup -q -n yaml-cpp +%patch0 -p1 # Fix eol sed -i 's/\r//' license.txt %build # ask cmake to not strip binaries -%cmake . +%cmake . -DYAML_CPP_BUILD_TOOLS=0 make VERBOSE=1 %{?_smp_mflags} @@ -67,6 +70,9 @@ rm -rf %{buildroot} %changelog +* Mon May 09 2011 Guido Grazioli - 0.2.6-1 +- Upstream 0.2.6 + * Tue Feb 08 2011 Fedora Release Engineering - 0.2.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild