From 4643743dee6e6ead501af8dbcc1f500960722d24246199adaf6e347634363d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 Feb 2018 16:19:43 +0000 Subject: [PATCH 1/2] Accepting request 572048 from home:pmonrealgonzalez:branches:devel:libraries:c_c++ - Update to version 0.6.0 * yaml-cpp no longer depends on Boost * Requires C++11 * Some bug fixes and performance improvements - Dropped patch yaml-cpp-disable-bundled-gmock.patch since it can be configured with the option YAML_CPP_BUILD_TESTS OBS-URL: https://build.opensuse.org/request/show/572048 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/yaml-cpp?expand=0&rev=19 --- yaml-cpp-0.5.3.tar.gz | 3 -- yaml-cpp-0.6.0.tar.gz | 3 ++ yaml-cpp-disable-bundled-gmock.patch | 12 -------- yaml-cpp.changes | 10 +++++++ yaml-cpp.spec | 43 ++++++++++++++-------------- 5 files changed, 35 insertions(+), 36 deletions(-) delete mode 100644 yaml-cpp-0.5.3.tar.gz create mode 100644 yaml-cpp-0.6.0.tar.gz delete mode 100644 yaml-cpp-disable-bundled-gmock.patch diff --git a/yaml-cpp-0.5.3.tar.gz b/yaml-cpp-0.5.3.tar.gz deleted file mode 100644 index 4250818..0000000 --- a/yaml-cpp-0.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac50a27a201d16dc69a881b80ad39a7be66c4d755eda1f76c3a68781b922af8f -size 2016737 diff --git a/yaml-cpp-0.6.0.tar.gz b/yaml-cpp-0.6.0.tar.gz new file mode 100644 index 0000000..b15aa55 --- /dev/null +++ b/yaml-cpp-0.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e643119f1d629a77605f02096cc3ac211922d48e3db12249b06a3db810dd8756 +size 1396163 diff --git a/yaml-cpp-disable-bundled-gmock.patch b/yaml-cpp-disable-bundled-gmock.patch deleted file mode 100644 index a239f95..0000000 --- a/yaml-cpp-disable-bundled-gmock.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: yaml-cpp-release-0.5.3/CMakeLists.txt -=================================================================== ---- yaml-cpp-release-0.5.3.orig/CMakeLists.txt -+++ yaml-cpp-release-0.5.3/CMakeLists.txt -@@ -328,7 +328,6 @@ endif() - ### Extras - ### - if(YAML_CPP_BUILD_TOOLS) -- add_subdirectory(test) - add_subdirectory(util) - endif() - diff --git a/yaml-cpp.changes b/yaml-cpp.changes index 6a33c55..573a4e5 100644 --- a/yaml-cpp.changes +++ b/yaml-cpp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 31 11:19:44 UTC 2018 - pmonrealgonzalez@suse.com + +- Update to version 0.6.0 + * yaml-cpp no longer depends on Boost + * Requires C++11 + * Some bug fixes and performance improvements +- Dropped patch yaml-cpp-disable-bundled-gmock.patch since it can + be configured with the option YAML_CPP_BUILD_TESTS + ------------------------------------------------------------------- Thu Feb 2 15:48:20 UTC 2017 - adam.majer@suse.de diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 578c64a..d0bf966 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,7 +1,7 @@ # # spec file for package yaml-cpp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,9 +16,9 @@ # -%define library_name libyaml-cpp0_5 +%define library_name libyaml-cpp0_6 Name: yaml-cpp -Version: 0.5.3 +Version: 0.6.0 Release: 0 Summary: YAML parser and emitter in C++ License: MIT @@ -28,19 +28,16 @@ Source: https://github.com/jbeder/yaml-cpp/archive/release-%{version}/%{ # PATCH-FIX-UPSTREAM: do not override opts for linker as distro provides # correct ones Patch0: yaml-cpp-fix-pie.patch -# PATCH-FIX-SUSE: disable bunlded gmock as the tests can't be run in obs anyway -Patch1: yaml-cpp-disable-bundled-gmock.patch -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif BuildRequires: cmake -BuildRequires: gcc -BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: sed -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{?suse_version} >= 1330 +BuildRequires: gcc +BuildRequires: gcc-c++ +%else +BuildRequires: gcc6 +BuildRequires: gcc6-c++ +%endif %description A YAML parser and emitter in C++ matching the YAML 1.2 spec. @@ -56,22 +53,25 @@ A YAML parser and emitter in C++ matching the YAML 1.2 spec. Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: %{library_name} = %{version} -%if 0%{?suse_version} > 1325 -Requires: libboost_headers-devel -%else -Requires: boost-devel -%endif %description devel Development files for %{name} library. %prep -%setup -q -n %{name}-release-%{version} +%setup -q -n %{name}-%{name}-%{version} %patch0 -p1 -%patch1 -p1 %build -%cmake +export CC=gcc +export CXX=g++ +%if 0%{?suse_version} < 1330 +export CC=gcc-6 +export CXX=g++-6 +%endif +%cmake -DYAML_CPP_BUILD_TESTS:BOOL=OFF \ + -DCMAKE_C_COMPILER=$CC \ + -DCMAKE_CXX_COMPILER=$CXX + make %{?_smp_mflags} %install @@ -90,5 +90,6 @@ make %{?_smp_mflags} %{_includedir}/yaml-cpp/ %{_libdir}/libyaml-cpp.so %{_libdir}/pkgconfig/yaml-cpp.pc +%{_libdir}/cmake/%{name}/ %changelog From f6fc394b55f189b51d9fbe6138ee7928fe2f55a990cad2eb79f026127e5b09fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 Feb 2018 16:56:46 +0000 Subject: [PATCH 2/2] - Update to 0.6.1: * Just brownpaperbag over previous release OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/yaml-cpp?expand=0&rev=20 --- yaml-cpp-0.6.0.tar.gz | 3 --- yaml-cpp-0.6.1.tar.gz | 3 +++ yaml-cpp.changes | 6 ++++++ yaml-cpp.spec | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 yaml-cpp-0.6.0.tar.gz create mode 100644 yaml-cpp-0.6.1.tar.gz diff --git a/yaml-cpp-0.6.0.tar.gz b/yaml-cpp-0.6.0.tar.gz deleted file mode 100644 index b15aa55..0000000 --- a/yaml-cpp-0.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e643119f1d629a77605f02096cc3ac211922d48e3db12249b06a3db810dd8756 -size 1396163 diff --git a/yaml-cpp-0.6.1.tar.gz b/yaml-cpp-0.6.1.tar.gz new file mode 100644 index 0000000..3fb0c01 --- /dev/null +++ b/yaml-cpp-0.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25ec37e6d82ab8c485926d69a5567741c7263515f8631e5dcb3fb4708e6b0d0d +size 1396262 diff --git a/yaml-cpp.changes b/yaml-cpp.changes index 573a4e5..d29200d 100644 --- a/yaml-cpp.changes +++ b/yaml-cpp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 2 16:56:09 UTC 2018 - tchvatal@suse.com + +- Update to 0.6.1: + * Just brownpaperbag over previous release + ------------------------------------------------------------------- Wed Jan 31 11:19:44 UTC 2018 - pmonrealgonzalez@suse.com diff --git a/yaml-cpp.spec b/yaml-cpp.spec index d0bf966..3fb54e3 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -18,13 +18,13 @@ %define library_name libyaml-cpp0_6 Name: yaml-cpp -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: YAML parser and emitter in C++ License: MIT Group: Development/Libraries/C and C++ Url: https://github.com/jbeder/yaml-cpp/ -Source: https://github.com/jbeder/yaml-cpp/archive/release-%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM: do not override opts for linker as distro provides # correct ones Patch0: yaml-cpp-fix-pie.patch