Fixes improperly generated cmake config files, RHBZ#1558637.

This commit is contained in:
Richard Shaw 2018-04-09 07:16:06 -05:00
commit 5be39b2a2f
3 changed files with 73 additions and 77 deletions

View file

@ -2,7 +2,7 @@
Name: yaml-cpp
Version: 0.6.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: A YAML parser and emitter for C++
Group: Development/Libraries
License: MIT
@ -10,6 +10,7 @@ URL: https://github.com/jbeder/yaml-cpp
Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz
Patch0: yaml-cpp-static.patch
Patch1: yaml-cpp-include_dir.patch
BuildRequires: cmake gcc gcc-c++
@ -45,17 +46,31 @@ The %{name}-static package contains the static library for %{name}.
%build
# ask cmake to not strip binaries
rm -rf build_shared && mkdir build_shared
rm -rf build_static && mkdir build_static
pushd build_shared
%cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=ON \
-DYAML_CPP_BUILD_TESTS=OFF \
./
../
%make_build
popd
pushd build_static
%cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DYAML_CPP_BUILD_TESTS=OFF \
../
%make_build
%install
pushd build_shared
%make_install
popd
pushd build_static
%make_install yaml-cpp
%post -p /sbin/ldconfig
@ -82,6 +97,9 @@ The %{name}-static package contains the static library for %{name}.
%changelog
* Mon Apr 09 2018 Richard Shaw <hobbes1069@gmail.com> - 0.6.1-2
- Fixes improperly generated cmake config files, RHBZ#1558637.
* Sun Feb 18 2018 Richard Shaw <hobbes1069@gmail.com> - 0.6.1-1
- Update to 0.6.1.