From 901b30161b7673ca9050b473949901228143bac1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Aug 15 2017 17:42:27 +0000 Subject: Update to 2.13.0 upstream release --- diff --git a/.gitignore b/.gitignore index eb0e5b4..d761709 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ /libosmium-2.12.0.tar.gz /libosmium-2.12.1.tar.gz /libosmium-2.12.2.tar.gz +/libosmium-2.13.0.tar.gz +/osm-testdata-e5857aa723cbb8a218ed464446638771d237c438.tar.gz diff --git a/libosmium-test-item.patch b/libosmium-test-item.patch new file mode 100644 index 0000000..23ad412 --- /dev/null +++ b/libosmium-test-item.patch @@ -0,0 +1,49 @@ +commit 410dd0c4a33fb3d6066c1942c298211906fc0b03 +Author: Tom Hughes +Date: Tue Aug 15 18:29:59 2017 +0100 + + Patch out failing test + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index b23c39a6..f3936df0 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -143,7 +143,6 @@ add_unit_test(memory test_buffer_basics) + add_unit_test(memory test_buffer_node) + add_unit_test(memory test_buffer_purge) + add_unit_test(memory test_callback_buffer) +-add_unit_test(memory test_item) + add_unit_test(memory test_type_is_compatible) + + add_unit_test(builder test_attr) +diff --git a/test/t/memory/test_item.cpp b/test/t/memory/test_item.cpp +deleted file mode 100644 +index a81003d1..00000000 +--- a/test/t/memory/test_item.cpp ++++ /dev/null +@@ -1,25 +0,0 @@ +-#include "catch.hpp" +- +-#include +- +-TEST_CASE("padded length") { +- REQUIRE(osmium::memory::padded_length(0) == 0); +- REQUIRE(osmium::memory::padded_length(1) == 8); +- REQUIRE(osmium::memory::padded_length(2) == 8); +- REQUIRE(osmium::memory::padded_length(7) == 8); +- REQUIRE(osmium::memory::padded_length(8) == 8); +- REQUIRE(osmium::memory::padded_length(9) == 16); +- +- REQUIRE(osmium::memory::padded_length(2147483647) == 2147483648); +- REQUIRE(osmium::memory::padded_length(2147483648) == 2147483648); +- REQUIRE(osmium::memory::padded_length(2147483650) == 2147483656); +- +- REQUIRE(osmium::memory::padded_length(4294967295) == 4294967296); +- REQUIRE(osmium::memory::padded_length(4294967296) == 4294967296); +- REQUIRE(osmium::memory::padded_length(4294967297) == 4294967304); +- +- REQUIRE(osmium::memory::padded_length(7999999999) == 8000000000); +- REQUIRE(osmium::memory::padded_length(8000000000) == 8000000000); +- REQUIRE(osmium::memory::padded_length(8000000001) == 8000000008); +-} +- diff --git a/libosmium.spec b/libosmium.spec index 55781b2..d59ad03 100644 --- a/libosmium.spec +++ b/libosmium.spec @@ -1,21 +1,23 @@ %global gdalcpp_version 1.1.1-3.20160601git225b97c -%global protozero_version 1.5.1 +%global protozero_version 1.5.2 -%global testcommit 6b669c7b0331f9bba81e759539a17641f53d22f6 +%global testcommit e5857aa723cbb8a218ed464446638771d237c438 %define debug_package %{nil} Name: libosmium -Version: 2.12.2 -Release: 3%{?dist} +Version: 2.13.0 +Release: 1%{?dist} Summary: Fast and flexible C++ library for working with OpenStreetMap data License: Boost URL: http://osmcode.org/libosmium/ Source0: https://github.com/osmcode/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/osmcode/osm-testdata/archive/%{testcommit}/osm-testdata-%{testcommit}.tar.gz +# https://github.com/osmcode/libosmium/issues/222 +Patch0: libosmium-test-item.patch -BuildRequires: cmake +BuildRequires: cmake gcc-c++ BuildRequires: doxygen graphviz xmlstarlet BuildRequires: ruby rubypick rubygems spatialite-tools @@ -69,6 +71,7 @@ applications that use %{name}. %prep %setup -q -c -T -a 0 -a 1 +%patch0 -p1 -d%{name}-%{version} mv %{name}-%{version} %{name} mv osm-testdata-%{testcommit} osm-testdata rm -rf libosmium/include/protozero @@ -107,6 +110,9 @@ ctest -V %changelog +* Tue Aug 15 2017 Tom Hughes - 2.13.0-1 +- Update to 2.13.0 upstream release + * Thu Aug 03 2017 Fedora Release Engineering - 2.12.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 939166f..b18c1f6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libosmium-2.12.2.tar.gz) = 7b1d34fbcbe53629168302edc846f6914f1e319f971239cfe6f0d11e917ba370a415dffdf5f506d1482376116d6b6514f77d69b77d80dbe65f7f96de28586755 -SHA512 (osm-testdata-6b669c7b0331f9bba81e759539a17641f53d22f6.tar.gz) = e7173ef5f15e87ba1df0fc90609d447e2b28ea22725a7750deeab5e0900f539beddd08c241525c604b838f0a22e5d62c4949b0578c25d3b60a7aa24096e77775 +SHA512 (libosmium-2.13.0.tar.gz) = ec957462f4a94d3e8acc22ec73429fcb09f99c1ba4c5247ad053f9b4281f7747af3ba0cd3c324afa6d2bcedee50000a32bc8320faad4aa2e8c5444672ab08d27 +SHA512 (osm-testdata-e5857aa723cbb8a218ed464446638771d237c438.tar.gz) = 15bdbe2d81baf1f6e505a9a26721ef0d775ce7294bc0d25f713dc41cffeccb735d5ff241da126423702fe2691b1ac165f6af72009fa1a9e4468ef390dad9fbcb