Update to v1.2.2 (bug #1422474)
This commit is contained in:
parent
791e948ac0
commit
8330b0beea
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1,3 @@
|
||||
/*.src.rpm
|
||||
/cereal-1.2.1.tar.gz
|
||||
/cereal-1.2.2.tar.gz
|
||||
|
24
cereal.spec
24
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 <junghans@votca.org> - 1.2.2-1
|
||||
- Update to v1.2.2 (bug #1422474)
|
||||
|
||||
* Sat Sep 03 2016 Christoph Junghans <junghans@votca.org> - 1.2.1-2
|
||||
- Minor changes from review (bug #1372403)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user