Update to 1.1.0 upstream release
This commit is contained in:
parent
cc81212a92
commit
f7e48fbfd2
@ -1,11 +1,11 @@
|
||||
commit bc0f878abe02fe85392c3aca3f8af7cc098548e1
|
||||
commit e61866f098098422462e8bc220506443e76c3bb0
|
||||
Author: Björn Esser <me@besser82.io>
|
||||
Date: Sun Apr 3 11:21:47 2016 +0200
|
||||
|
||||
do not include gtest_src_dir
|
||||
|
||||
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||||
index c698af4..5269eb7 100644
|
||||
index 11c1b04..43377db 100644
|
||||
--- a/test/CMakeLists.txt
|
||||
+++ b/test/CMakeLists.txt
|
||||
@@ -8,7 +8,7 @@ IF(GTESTSRC_FOUND)
|
||||
@ -14,6 +14,6 @@ index c698af4..5269eb7 100644
|
||||
|
||||
- add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
|
||||
+# add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
|
||||
include_directories(${GTEST_INCLUDE_DIR})
|
||||
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
|
||||
|
||||
set(TEST_LIBRARIES gtest gtest_main)
|
@ -55,7 +55,7 @@ JSON(JavaScript Object Notation) is a light-weight data exchange \
|
||||
format. RapidJSON should be in fully compliance with RFC4627/ECMA-404.
|
||||
|
||||
Name: rapidjson
|
||||
Version: 1.0.2
|
||||
Version: 1.1.0
|
||||
Release: 1%{?gitrel}%{?dist}
|
||||
Summary: Fast JSON parser and generator for C++
|
||||
|
||||
@ -70,7 +70,7 @@ Source0: %{giturl}/%{commit}.tar.gz#/%{gittar}
|
||||
%endif # 0%%{?rel_build}
|
||||
|
||||
# Downstream-patch for gtest.
|
||||
Patch0: rapidjson-1.0.2-do_not_include_gtest_src_dir.patch
|
||||
Patch0: rapidjson-1.1.0-do_not_include_gtest_src_dir.patch
|
||||
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gtest-devel
|
||||
@ -135,7 +135,7 @@ done
|
||||
|
||||
# Disable -Werror.
|
||||
%{_bindir}/find . -type f -name 'CMakeLists.txt' -print0 | \
|
||||
%{_bindir}/xargs -0 %{__sed} -i -e's![ \t]*-Werror!!g'
|
||||
%{_bindir}/xargs -0 %{__sed} -i -e's![ \t]*-march=native!!g' -e's![ \t]*-Werror!!g'
|
||||
|
||||
|
||||
%build
|
||||
@ -170,8 +170,8 @@ popd
|
||||
|
||||
|
||||
%check
|
||||
# Valgrind fails on %%ix86.
|
||||
%ifarch %{ix86}
|
||||
# Valgrind fails on %%ix86 and aarch64.
|
||||
%ifarch %{ix86} aarch64
|
||||
CTEST_EXCLUDE=".*valgrind.*"
|
||||
%endif # arch %%{ix86}
|
||||
pushd %{cmake_build_dir}
|
||||
@ -180,6 +180,11 @@ popd
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 10 2017 Tom Hughes <tom@compton.nu> - 1.1.0-1
|
||||
- Update to 1.1.0 upstream release
|
||||
- Drop -march=native as ppc64 doesn't recognise it
|
||||
- Exclude valgrind on aarch64 due to unhandled instruction in libgcc
|
||||
|
||||
* Sun Apr 03 2016 Björn Esser <fedora@besser82.io> - 1.0.2-1
|
||||
- update to latest upstream-release (#1322941)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user