diff --git a/.gitignore b/.gitignore index 40f43da..9989916 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ yaml-cpp-0.2.5.tar.gz /yaml-cpp-0.2.7.tar.gz /yaml-cpp-0.3.0.tar.gz /yaml-cpp-0.5.1.tar.gz -/yaml-cpp-0.5.3.tar.gz diff --git a/sources b/sources index 3959291..210cc7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64200ca0bf5e0af065804d8d3e8f6d42 yaml-cpp-0.5.3.tar.gz +0fa47a5ed8fedefab766592785c85ee7 yaml-cpp-0.5.1.tar.gz diff --git a/yaml-cpp.spec b/yaml-cpp.spec index 4b243ec..24c96ec 100644 --- a/yaml-cpp.spec +++ b/yaml-cpp.spec @@ -1,12 +1,14 @@ Name: yaml-cpp -Version: 0.5.3 -Release: 7%{?dist} +Epoch: 1 +Version: 0.5.1 +Release: 1%{?dist} Summary: A YAML parser and emitter for C++ Group: Development/Libraries License: MIT -URL: https://github.com/jbeder/yaml-cpp -Source0: https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz -BuildRequires: cmake gcc-c++ +URL: http://code.google.com/p/yaml-cpp/ +Source0: http://yaml-cpp.googlecode.com/files/%{name}-%{version}.tar.gz + +BuildRequires: cmake BuildRequires: boost-devel %description @@ -25,19 +27,53 @@ Requires: boost-devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package static +Summary: Static library for %{name} +Group: Development/Libraries +License: MIT +Requires: %{name}-devel%{?_isa} = %{version}-%{release} + +%description static +The %{name}-static package contains the static library for %{name}. + %prep -%setup -qn %{name}-release-%{version} +%autosetup +# Fix eol +sed -i 's/\r//' license.txt %build -# ask cmake to not strip binaries -%cmake . -DYAML_CPP_BUILD_TOOLS=0 -make VERBOSE=1 %{?_smp_mflags} +### Build shared libraries +mkdir build-shared +pushd build-shared + # ask cmake to not strip binaries + %cmake -DYAML_CPP_BUILD_TOOLS=0 \ + -DBUILD_SHARED_LIBS=ON \ + ../ + %make_build +popd + +### Build static libraries +mkdir build-static +pushd build-static + # ask cmake to not strip binaries + %cmake -DYAML_CPP_BUILD_TOOLS=0 \ + -DBUILD_SHARED_LIBS=OFF \ + -DYAML_CPP_BUILD_CONTRIB=OFF \ + ../ + %make_build +popd %install -%make_install +pushd build-shared + %make_install +popd + +pushd build-static + %make_install +popd %post -p /sbin/ldconfig @@ -46,8 +82,7 @@ make VERBOSE=1 %{?_smp_mflags} %files -%doc CONTRIBUTING.md README.md -%license LICENSE +%doc license.txt %{_libdir}/*.so.* %files devel @@ -55,46 +90,15 @@ make VERBOSE=1 %{?_smp_mflags} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files static +%license license.txt +%{_libdir}/*.a + %changelog -* Thu Jul 27 2017 Fedora Release Engineering - 0.5.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 19 2017 Jonathan Wakely - 0.5.3-6 -- Rebuilt for s390x binutils bug - -* Tue Jul 04 2017 Jonathan Wakely - 0.5.3-5 -- Rebuilt for Boost 1.64 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.5.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-3 -- Rebuilt for Boost 1.63 - -* Fri Jan 27 2017 Jonathan Wakely - 0.5.3-2 -- Rebuilt for Boost 1.63 - -* Tue Aug 23 2016 Richard Shaw - 0.5.3-1 -- Update to latest upstream release. - -* Fri Feb 05 2016 Fedora Release Engineering - 0.5.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sat Jan 16 2016 Jonathan Wakely - 0.5.1-12 -- Rebuilt for Boost 1.60 - -* Thu Aug 27 2015 Jonathan Wakely - 0.5.1-11 -- Rebuilt for Boost 1.59 - -* Wed Jul 29 2015 Fedora Release Engineering - 0.5.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 - -* Wed Jul 22 2015 David Tardon - 0.5.1-9 -- rebuild for Boost 1.58 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Sun Jan 28 2018 Richard Shaw - 1:0.5.1-1 +- Revert epel7 branch back to 0.5.1. +- Add static library package. * Sat May 02 2015 Kalev Lember - 0.5.1-7 - Rebuilt for GCC 5 C++11 ABI change