forked from pool/yaml-cpp
Accepting request 572095 from devel:libraries:c_c++
- Update to 0.6.1: * Just brownpaperbag over previous release - 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/572095 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/yaml-cpp?expand=0&rev=12
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:ac50a27a201d16dc69a881b80ad39a7be66c4d755eda1f76c3a68781b922af8f
|
|
||||||
size 2016737
|
|
||||||
3
yaml-cpp-0.6.1.tar.gz
Normal file
3
yaml-cpp-0.6.1.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:25ec37e6d82ab8c485926d69a5567741c7263515f8631e5dcb3fb4708e6b0d0d
|
||||||
|
size 1396262
|
||||||
@@ -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()
|
|
||||||
|
|
||||||
@@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- 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
|
Thu Feb 2 15:48:20 UTC 2017 - adam.majer@suse.de
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package yaml-cpp
|
# 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
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -16,31 +16,28 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define library_name libyaml-cpp0_5
|
%define library_name libyaml-cpp0_6
|
||||||
Name: yaml-cpp
|
Name: yaml-cpp
|
||||||
Version: 0.5.3
|
Version: 0.6.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: YAML parser and emitter in C++
|
Summary: YAML parser and emitter in C++
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Url: https://github.com/jbeder/yaml-cpp/
|
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
|
# PATCH-FIX-UPSTREAM: do not override opts for linker as distro provides
|
||||||
# correct ones
|
# correct ones
|
||||||
Patch0: yaml-cpp-fix-pie.patch
|
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: cmake
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
%if %{?suse_version} >= 1330
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc6
|
||||||
|
BuildRequires: gcc6-c++
|
||||||
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A YAML parser and emitter in C++ matching the YAML 1.2 spec.
|
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}
|
Summary: Development files for %{name}
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Requires: %{library_name} = %{version}
|
Requires: %{library_name} = %{version}
|
||||||
%if 0%{?suse_version} > 1325
|
|
||||||
Requires: libboost_headers-devel
|
|
||||||
%else
|
|
||||||
Requires: boost-devel
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
Development files for %{name} library.
|
Development files for %{name} library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-release-%{version}
|
%setup -q -n %{name}-%{name}-%{version}
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%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}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@@ -90,5 +90,6 @@ make %{?_smp_mflags}
|
|||||||
%{_includedir}/yaml-cpp/
|
%{_includedir}/yaml-cpp/
|
||||||
%{_libdir}/libyaml-cpp.so
|
%{_libdir}/libyaml-cpp.so
|
||||||
%{_libdir}/pkgconfig/yaml-cpp.pc
|
%{_libdir}/pkgconfig/yaml-cpp.pc
|
||||||
|
%{_libdir}/cmake/%{name}/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
|||||||
Reference in New Issue
Block a user