diff --git a/.gitignore b/.gitignore index 5ecfdfe..6d330a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +/*.src.rpm /cereal-1.2.1.tar.gz +/cereal-1.2.2.tar.gz diff --git a/cereal.spec b/cereal.spec index fd096f0..435aa4c 100644 --- a/cereal.spec +++ b/cereal.spec @@ -1,13 +1,17 @@ +# The (empty) main package is arch, to have the package built and tests run +# on all arches, but the actual result package is the noarch -devel subpackge. +# Debuginfo packages are disabled to prevent rpmbuild from generating an empty +# debuginfo package for the empty main package. +%global debug_package %{nil} + Name: cereal -Version: 1.2.1 -Release: 2%{?dist} +Version: 1.2.2 +Release: 1%{?dist} Summary: A header-only C++11 serialization library License: BSD Url: http://uscilab.github.io/cereal/ Source0: https://github.com/USCiLab/cereal/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildArch: noarch - BuildRequires: gcc-c++ BuildRequires: boost-devel BuildRequires: %{?fedora:cmake >= 3.0}%{?rhel:cmake3 >= 3.0} @@ -21,6 +25,7 @@ easily bundled with other code or used standalone. %package devel Summary: Development headers and libraries for %{name} +BuildArch: noarch %description devel cereal is a header-only C++11 serialization library. cereal takes arbitrary @@ -33,22 +38,18 @@ This package contains development headers and libraries for the cereal library %prep %setup -q -#https://github.com/USCiLab/cereal/pull/337 -sed -i 's/-Werror//' CMakeLists.txt %build mkdir %{_target_platform} pushd %{_target_platform} -%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. -DSKIP_PORTABILITY_TEST=ON +%{?fedora:%{cmake}}%{?rhel:%{cmake3}} .. -DSKIP_PORTABILITY_TEST=ON -DWITH_WERROR=OFF %make_build %install %make_install -C %{_target_platform} %check -#test_portable_binary_archive is broken -#https://github.com/USCiLab/cereal/issues/338 -make -C %{_target_platform} test ARGS="-V -E test_portable_binary_archive" +make -C %{_target_platform} test ARGS="-V" %files devel %doc README.md @@ -58,6 +59,9 @@ make -C %{_target_platform} test ARGS="-V -E test_portable_binary_archive" %{_datadir}/cmake/%{name} %changelog +* Wed Feb 15 2017 Christoph Junghans - 1.2.2-1 +- Update to v1.2.2 (bug #1422474) + * Sat Sep 03 2016 Christoph Junghans - 1.2.1-2 - Minor changes from review (bug #1372403) diff --git a/sources b/sources index 610b668..4f81666 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -64476ed74c19068ee543b53ad3992261 cereal-1.2.1.tar.gz +SHA512 (cereal-1.2.2.tar.gz) = 9567b2e19add9446b24f8afd122eea09ba6ecd1a090335cf0ab31fdc8f64c6c97daa3d9eaf0801c36a770737488e0eebf81d96d7b7a65deed30da6130f2d47eb