diff --git a/.gitignore b/.gitignore index 77055e9..6d8a679 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.6.tar.gz +/yaml-cpp-0.2.7.tar.gz diff --git a/001_yaml-cpp_fixbuildgcc46.patch b/001_yaml-cpp_fixbuildgcc46.patch deleted file mode 100644 index e5b6ad2..0000000 --- a/001_yaml-cpp_fixbuildgcc46.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 643253b..bde26e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddfa5e8d409d9dafbeb6d190cd68dbcb yaml-cpp-0.2.6.tar.gz +6878e14bad90c69a8f2caca273eb24c2 yaml-cpp-0.2.7.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4ab9fed..eccf2fb 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,13 +1,11 @@ Name: yaml-cpp -Version: 0.2.6 +Version: 0.2.7 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 @@ -28,8 +26,7 @@ developing applications that use %{name}. %prep -%setup -q -n yaml-cpp -%patch0 -p1 +%setup -q # Fix eol sed -i 's/\r//' license.txt @@ -70,6 +67,10 @@ rm -rf %{buildroot} %changelog +* Fri Sep 30 2011 Guido Grazioli - 0.2.7-1 +- Update to 0.2.7 +- Remove gcc 4.6 patch fixed upstream + * Mon May 09 2011 Guido Grazioli - 0.2.6-1 - Upstream 0.2.6