Upload new sources.

.gitignore

@@ -7,3 +7,4 @@ yaml-cpp-0.2.5.tar.gz
 /yaml-cpp-0.6.0.tar.gz
 /yaml-cpp-0.6.1.tar.gz
 /yaml-cpp-0.6.2.tar.gz
+/yaml-cpp-0.6.3.tar.gz

sources

@@ -1 +1 @@
-SHA512 (yaml-cpp-0.6.2.tar.gz) = fea8ce0a20a00cbc75023d1db442edfcd32d0ac57a3c41b32ec8d56f87cc1d85d7dd7a923ce662f5d3a315f91a736d6be0d649997acd190915c1d68cc93795e4
+SHA512 (yaml-cpp-0.6.3.tar.gz) = 68b9ce987cabc1dec79382f922de20cc2c222cb9c090ecb93dc686b048da5c917facf4fce6d8f72feea44b61e5a6770ed3b0c199c4cd4e6bde5b6245c09f8e49

yaml-cpp.spec

@@ -1,16 +1,14 @@
 %global sover 0.6
 
 Name:           yaml-cpp
-Version:        0.6.2
+Version:        0.6.3
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        A YAML parser and emitter for C++
 License:        MIT 
 URL:            https://github.com/jbeder/yaml-cpp
 Source0:        https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz
 
-Patch0:         yaml-cpp-static.patch
+Patch0:         CVE-2017-5950.patch
-Patch1:         yaml-cpp-include_dir.patch
-Patch2:         CVE-2017-5950.patch
 
 BuildRequires:  cmake gcc gcc-c++
 
@@ -48,7 +46,7 @@ rm -rf build_static && mkdir build_static
 
 pushd build_shared
 %cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-       -DBUILD_SHARED_LIBS=ON \
+       -DYAML_BUILD_SHARED_LIBS=ON \
        -DYAML_CPP_BUILD_TESTS=OFF \
        ../
 %make_build
@@ -56,19 +54,26 @@ popd
 
 pushd build_static
 %cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-       -DBUILD_SHARED_LIBS=OFF \
+       -DYAML_BUILD_SHARED_LIBS=OFF \
        -DYAML_CPP_BUILD_TESTS=OFF \
        ../
 %make_build
 
 
 %install
-pushd build_shared
-%make_install
-popd
 pushd build_static
 %make_install yaml-cpp
+popd
 
+# Move files so they don't get trampled
+mv %{buildroot}%{_libdir}/cmake/%{name} \
+   %{buildroot}%{_libdir}/cmake/%{name}-static
+mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \
+   %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc
+
+
+pushd build_shared
+%make_install
 
 %ldconfig_scriptlets
 
@@ -92,6 +97,9 @@ pushd build_static
 
 
 %changelog
+* Tue Oct 15 2019 Richard Shaw <hobbes1069@gmail.com> - 0.6.3-1
+- Update to 0.6.3.
+
 * Sun Jun 09 2019 Till Hofmann <thofmann@fedoraproject.org> - 0.6.2-2
 - Remove unused boost dependency