From f8b2061910faae2d1245d790295889cac05a84b0 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 20 Nov 2017 21:13:16 +0000 Subject: [PATCH 01/28] Update to 0.4.3 upstream release --- .gitignore | 1 + sources | 2 +- wagyu.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8efbc42..01e2a5b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /geometry-test-data-a623c19a91947a9d29f9ec5625ce620ab42325dc.tar.gz /wagyu-0.4.2.tar.gz +/wagyu-0.4.3.tar.gz diff --git a/sources b/sources index f0e7184..a245c16 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ +SHA512 (wagyu-0.4.3.tar.gz) = 6c9f5b86ce3c9d931607179ff71d9e98592145dc24ad1c3747af28bda93c508cf3f0aba3c69e079bd974c2c5d590246ba84c4a14d35ddbf1d16524bc258c11a2 SHA512 (geometry-test-data-a623c19a91947a9d29f9ec5625ce620ab42325dc.tar.gz) = 373dcd7ead751975e75fb0765362dd20bd37e621ca22ecb4592298b2303d9554731cf67cfb7a124e1c78397db92c5bc1f77d0aebb4f7999212b86e2ffba11690 -SHA512 (wagyu-0.4.2.tar.gz) = dba4ae4575288c972eb4afacaa218a6fb86bb7ade8e606730718d5f8d3e1426410c75e45d8dae60006b4151850b909337f194f8512911d029d80a731ed265c8a diff --git a/wagyu.spec b/wagyu.spec index 1d9b450..06f7dd2 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -7,8 +7,8 @@ %global debug_package %{nil} Name: wagyu -Version: 0.4.2 -Release: 3%{?dist} +Version: 0.4.3 +Release: 1%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -82,6 +82,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Mon Nov 20 2017 Tom Hughes - 0.4.3-1 +- Update to 0.4.3 upstream release + * Thu Aug 03 2017 Fedora Release Engineering - 0.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From af50806824cd153c2d81ec6559f52232fb0ff03c Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 15 Jan 2018 22:27:08 +0000 Subject: [PATCH 02/28] Build using catch1 --- wagyu.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/wagyu.spec b/wagyu.spec index 06f7dd2..09caaf1 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -19,7 +19,7 @@ Source1: https://github.com/mapnik/geometry-test-data/archive/%{testcommi Patch0: wagyu-mason.patch BuildRequires: gcc-c++ -BuildRequires: catch-devel +BuildRequires: catch1-devel BuildRequires: boost-devel >= %{boost_version} BuildRequires: boost-static >= %{boost_version} BuildRequires: rapidjson-devel >= %{rapidjson_version} @@ -82,6 +82,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Mon Jan 15 2018 Tom Hughes - 0.4.3-2 +- Build using catch1 + * Mon Nov 20 2017 Tom Hughes - 0.4.3-1 - Update to 0.4.3 upstream release From cbe284508148fc878706e0ccfd67476647fd8fea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:44:16 +0000 Subject: [PATCH 03/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 09caaf1..49167de 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -82,6 +82,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 0.4.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 15 2018 Tom Hughes - 0.4.3-2 - Build using catch1 From 6fdfd4c647b85a78633566192a232d5c2720bd69 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 13 Feb 2018 09:05:52 +0000 Subject: [PATCH 04/28] Remove -Werror from compiler flags --- wagyu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wagyu.spec b/wagyu.spec index 49167de..568a8fe 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -59,6 +59,7 @@ be valid and simple as per the OGC. %prep %autosetup -p 1 -n wagyu-%{version} +sed -i -e "s/ -Werror / /" Makefile tar --directory=tests/geometry-test-data --strip-components=1 --gunzip --extract --file=%{SOURCE1} rm -f tests/catch.hpp From bdd358f91a7903f6d196bc62bba7e1d32baf1599 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 15 Jan 2018 22:27:08 +0000 Subject: [PATCH 05/28] Build using catch1 --- wagyu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 1d9b450..ee3e1f6 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -19,7 +19,7 @@ Source1: https://github.com/mapnik/geometry-test-data/archive/%{testcommi Patch0: wagyu-mason.patch BuildRequires: gcc-c++ -BuildRequires: catch-devel +BuildRequires: catch1-devel BuildRequires: boost-devel >= %{boost_version} BuildRequires: boost-static >= %{boost_version} BuildRequires: rapidjson-devel >= %{rapidjson_version} From d27cd45de144cbe2a553b76992d8e257ce17fa6a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:42:31 +0000 Subject: [PATCH 06/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 568a8fe..7b9bbba 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -83,6 +83,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 0.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 0.4.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From dfc8b4af794194fbaccada525820f152ed7fdc9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:31:17 +0000 Subject: [PATCH 07/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 7b9bbba..357f6a0 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -83,6 +83,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 0.4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 0.4.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a17893251483fb796ef85bfefe7ae37a2a1988b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:16:01 +0000 Subject: [PATCH 08/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 357f6a0..61b68fd 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -83,6 +83,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.4.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 0.4.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 88c894f13a244af478b269f10c1112baf28b085a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:27:53 +0000 Subject: [PATCH 09/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 61b68fd..a7dce90 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.4.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -83,6 +83,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.4.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 0.4.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b7b72c73fdf011f0d6e0d710cfbbb30360b6553f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 4 Mar 2020 19:20:10 +0000 Subject: [PATCH 10/28] Update to 0.5.0 upstream release --- wagyu-benchmark.patch | 32 ++++++++++++++++++++ wagyu-mason.patch | 69 +++++++++++++++++++++++++++---------------- wagyu.spec | 20 ++++++++----- 3 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 wagyu-benchmark.patch diff --git a/wagyu-benchmark.patch b/wagyu-benchmark.patch new file mode 100644 index 0000000..d0d2415 --- /dev/null +++ b/wagyu-benchmark.patch @@ -0,0 +1,32 @@ +commit 3495c2833a08fa45d2bca6f8847617ba3fc550be +Author: Tom Hughes +Date: Wed Mar 4 19:06:49 2020 +0000 + + Remove benchmarking support to avoid libbenchmark dependency + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 635f298..c098b0f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,9 +46,6 @@ include_directories(SYSTEM ${MASON_PACKAGE_geometry_INCLUDE_DIRS}) + mason_use(catch VERSION 1.9.6 HEADER_ONLY) + include_directories(SYSTEM ${MASON_PACKAGE_catch_INCLUDE_DIRS}) + +-mason_use(benchmark VERSION 1.4.1) +-include_directories(SYSTEM ${MASON_PACKAGE_benchmark_INCLUDE_DIRS}) +- + include_directories("${PROJECT_SOURCE_DIR}/include") + + file(GLOB TEST_SOURCES tests/unit/*.cpp) +@@ -59,11 +56,3 @@ add_executable(fixture-tests ${TEST_SOURCES}) + + file(GLOB FUZZER_SOURCES fuzzer/*.cpp) + add_executable(fuzzer-tests ${FUZZER_SOURCES}) +- +-# libbenchmark.a supports threads and therefore needs pthread support +-find_package(Threads REQUIRED) +-file(GLOB BENCH_SOURCES bench/*.cpp) +-add_executable(bench-tests ${BENCH_SOURCES}) +- +-# link benchmark static library to the bench-tests binary so the bench tests know where to find the benchmark impl code +-target_link_libraries(bench-tests ${MASON_PACKAGE_benchmark_STATIC_LIBS} ${MASON_PACKAGE_boost_libfilesystem_STATIC_LIBS} ${MASON_PACKAGE_boost_libsystem_STATIC_LIBS} ${CMAKE_THREAD_LIBS_INIT}) diff --git a/wagyu-mason.patch b/wagyu-mason.patch index baa084e..3f69123 100644 --- a/wagyu-mason.patch +++ b/wagyu-mason.patch @@ -1,34 +1,53 @@ -commit 478476f5c8e32c5c88476f01a7d5936e5a02a56f +commit da88110aea24b8953614449f78aa12e6a5c96826 Author: Tom Hughes Date: Sun Apr 9 14:59:06 2017 +0100 Rip out mason stuff - we use our own packages -diff --git a/Makefile b/Makefile -index cbfb1ba..a2f4365 100644 ---- a/Makefile -+++ b/Makefile -@@ -14,21 +14,10 @@ ANGUS_DEFINES := -D'CLIPPER_INTPOINT_IMPL=mapbox::geometry::point' -D'CLIP +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c098b0f..bdadb90 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,8 +4,6 @@ set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED on) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) - default: test +-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/mason.cmake) +- + option(WERROR "Add -Werror flag to build (turns warnings into errors)" ON) --mason_packages/headers/boost/$(BOOST_VERSION)/include: -- ./mason.sh install --header-only boost $(BOOST_VERSION) -- --mason_packages/headers/rapidjson/$(RAPIDJSON_VERSION)/include: -- ./mason.sh install --header-only rapidjson $(RAPIDJSON_VERSION) -- --mason_packages/headers/geometry/$(GEOMETRY_VERSION)/include: -- ./mason.sh install --header-only geometry $(GEOMETRY_VERSION) -- --deps: mason_packages/headers/boost/$(BOOST_VERSION)/include mason_packages/headers/rapidjson/$(RAPIDJSON_VERSION)/include mason_packages/headers/geometry/$(GEOMETRY_VERSION)/include -- --build-test: tests/* include/mapbox/geometry/* deps Makefile -+build-test: tests/* include/mapbox/geometry/* Makefile - $(CXX) $(RELEASE_FLAGS) tests/test.cpp tests/unit/*.cpp $(WARNING_FLAGS) $(CXXFLAGS) -isystem ./tests -o test + # configure optimization +@@ -23,28 +21,18 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(DESIRED_WARNINGS "${DESIRED_WARNINGS} -Wmost") + endif() --build-debug: tests/* include/mapbox/geometry/* deps Makefile -+build-debug: tests/* include/mapbox/geometry/* Makefile - $(CXX) $(DEBUG_FLAGS) tests/test.cpp tests/unit/*.cpp $(WARNING_FLAGS) $(CXXFLAGS) -isystem ./tests -o test +-# Note: -D_GLIBCXX_USE_CXX11_ABI=0 is needed to support mason packages that are precompiled libs +-# Currently we only depend on a header only library, but this will help avoid issues when more libs are added via mason +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTIMIZATION_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0 ${DESIRED_WARNINGS}") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTIMIZATION_FLAGS} ${DESIRED_WARNINGS}") + + if (WERROR) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + endif() + +-# mason_use is a mason function within the mason.cmake file and provides ready-to-go vars, like "STATIC_LIBS" and "INCLUDE_DIRS" +-mason_use(boost_libfilesystem VERSION 1.72.0) +-mason_use(boost_libsystem VERSION 1.72.0) +-mason_use(boost VERSION 1.72.0 HEADER_ONLY) +-include_directories(SYSTEM ${MASON_PACKAGE_boost_INCLUDE_DIRS}) +- +-mason_use(rapidjson VERSION 1.1.0 HEADER_ONLY) +-include_directories(SYSTEM ${MASON_PACKAGE_rapidjson_INCLUDE_DIRS}) ++find_package(Boost 1.69 REQUIRED COMPONENTS filesystem system) ++include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) + +-mason_use(geometry VERSION 1.0.0 HEADER_ONLY) +-include_directories(SYSTEM ${MASON_PACKAGE_geometry_INCLUDE_DIRS}) ++find_package(RapidJSON) + +-mason_use(catch VERSION 1.9.6 HEADER_ONLY) +-include_directories(SYSTEM ${MASON_PACKAGE_catch_INCLUDE_DIRS}) ++include_directories(SYSTEM /usr/include/catch) + + include_directories("${PROJECT_SOURCE_DIR}/include") - build-fixture-tester-r: diff --git a/wagyu.spec b/wagyu.spec index a7dce90..ecc6e50 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -1,23 +1,26 @@ -%global boost_version 1.63.0 +%global boost_version 1.69.0 %global rapidjson_version 1.1.0 -%global geometry_version 0.9.0 +%global geometry_version 1.0.0 %global testcommit a623c19a91947a9d29f9ec5625ce620ab42325dc %global debug_package %{nil} Name: wagyu -Version: 0.4.3 -Release: 7%{?dist} +Version: 0.5.0 +Release: 1%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost URL: https://github.com/mapbox/wagyu Source0: https://github.com/mapbox/wagyu/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/mapnik/geometry-test-data/archive/%{testcommit}/geometry-test-data-%{testcommit}.tar.gz +# Remove benchmarking support to avoid libbenchmark dependency +Patch0: wagyu-benchmark.patch # Rip out mason stuff - we use our own packages -Patch0: wagyu-mason.patch +Patch1: wagyu-mason.patch +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: catch1-devel BuildRequires: boost-devel >= %{boost_version} @@ -59,12 +62,12 @@ be valid and simple as per the OGC. %prep %autosetup -p 1 -n wagyu-%{version} -sed -i -e "s/ -Werror / /" Makefile tar --directory=tests/geometry-test-data --strip-components=1 --gunzip --extract --file=%{SOURCE1} rm -f tests/catch.hpp %build +%make_build release CXXFLAGS="-I$PWD/include %{optflags}" WERROR=False %install @@ -73,7 +76,7 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %check -%make_build test CXXFLAGS="-I$PWD/include -I/usr/include/catch %{optflags}" RELEASE_FLAGS="" +%make_build test CXXFLAGS="-I$PWD/include %{optflags}" WERROR=False %files devel @@ -83,6 +86,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Wed Mar 4 2020 Tom Hughes - 0.5.0-1 +- Update to 0.5.0 upstream release + * Fri Jan 31 2020 Fedora Release Engineering - 0.4.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 92322352696a804ccefd3a0e5111edf007368043 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 4 Mar 2020 19:26:43 +0000 Subject: [PATCH 11/28] Update source for wagyu 0.5.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 01e2a5b..5c83275 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /geometry-test-data-a623c19a91947a9d29f9ec5625ce620ab42325dc.tar.gz /wagyu-0.4.2.tar.gz /wagyu-0.4.3.tar.gz +/wagyu-0.5.0.tar.gz diff --git a/sources b/sources index a245c16..02d70e3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wagyu-0.4.3.tar.gz) = 6c9f5b86ce3c9d931607179ff71d9e98592145dc24ad1c3747af28bda93c508cf3f0aba3c69e079bd974c2c5d590246ba84c4a14d35ddbf1d16524bc258c11a2 +SHA512 (wagyu-0.5.0.tar.gz) = d2ef6c056b25e60677da4f53154790558ddb43c56aa117a4d5108f8c7686cceff9e5d54d71138e2eb504f053315d28f7cb8190ff45833c5606d511b685acf40d SHA512 (geometry-test-data-a623c19a91947a9d29f9ec5625ce620ab42325dc.tar.gz) = 373dcd7ead751975e75fb0765362dd20bd37e621ca22ecb4592298b2303d9554731cf67cfb7a124e1c78397db92c5bc1f77d0aebb4f7999212b86e2ffba11690 From cd302e1b0f003689f8ff454fd089a1e35a34fac1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:57:26 +0000 Subject: [PATCH 12/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index ecc6e50..de0b5ba 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -86,6 +86,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Mar 4 2020 Tom Hughes - 0.5.0-1 - Update to 0.5.0 upstream release From affb9ef9ed7f38a877054d23ce95574ceb39692b Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 1 Dec 2020 18:21:18 +0000 Subject: [PATCH 13/28] Add unnecessary BR on make --- wagyu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index de0b5ba..ead91d5 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -20,7 +20,7 @@ Patch0: wagyu-benchmark.patch # Rip out mason stuff - we use our own packages Patch1: wagyu-mason.patch -BuildRequires: cmake +BuildRequires: cmake make BuildRequires: gcc-c++ BuildRequires: catch1-devel BuildRequires: boost-devel >= %{boost_version} From 00032fd7826ab779016d9da9c87e7a3afddd19d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:18:35 +0000 Subject: [PATCH 14/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index ead91d5..c8f80ff 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -86,6 +86,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 8b777526ad26b71ac79ce6b0d749b0327e4832ab Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 29 Jan 2021 14:41:35 +0000 Subject: [PATCH 15/28] Switch to building as C++14 for boost 1.75 compatibility --- wagyu.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wagyu.spec b/wagyu.spec index c8f80ff..1b5a27f 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -19,6 +19,8 @@ Source1: https://github.com/mapnik/geometry-test-data/archive/%{testcommi Patch0: wagyu-benchmark.patch # Rip out mason stuff - we use our own packages Patch1: wagyu-mason.patch +# https://github.com/mapbox/wagyu/pull/109 +Patch2: wagyu-cxx14.patch BuildRequires: cmake make BuildRequires: gcc-c++ From e2f25b78fffdba07f7646051cbc64201f704d59e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 29 Jan 2021 14:53:10 +0000 Subject: [PATCH 16/28] Add missing patch --- wagyu-cxx14.patch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 wagyu-cxx14.patch diff --git a/wagyu-cxx14.patch b/wagyu-cxx14.patch new file mode 100644 index 0000000..71e5437 --- /dev/null +++ b/wagyu-cxx14.patch @@ -0,0 +1,18 @@ +commit ec4832e2b9cc9cd44ec9d2122d5f362899ca8ef5 +Author: Tom Hughes +Date: Fri Jan 29 14:20:38 2021 +0000 + + Switch to C++14 as Boost.Geometry requires it from Boost 1.75 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bdadb90..a346401 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,6 @@ + cmake_minimum_required(VERSION 3.8) + project(hpp_skel LANGUAGES CXX) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED on) + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + From 33d97092ab4d40465a4742675c4f2e895914e123 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:44:27 +0000 Subject: [PATCH 17/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 1b5a27f..9d532c6 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From cab136e336ceca25f7565a665b463f331018f2f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:15:19 +0000 Subject: [PATCH 18/28] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 9d532c6..de3c3c8 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 5bc6246aa41c24dd10921710226295946dbae806 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:11:21 +0000 Subject: [PATCH 19/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index de3c3c8..1a2c26e 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: Boost @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f2753ae55641b91008ffc1f83910d10aa511a610 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 11 Nov 2022 11:11:31 +0000 Subject: [PATCH 20/28] Switch license tag to SPDX --- wagyu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 1a2c26e..61d5fd3 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -11,7 +11,7 @@ Version: 0.5.0 Release: 6%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor -License: Boost +License: BSL-1.0 AND BSD-3-Clause URL: https://github.com/mapbox/wagyu Source0: https://github.com/mapbox/wagyu/archive/%{version}/%{name}-%{version}.tar.gz Source1: https://github.com/mapnik/geometry-test-data/archive/%{testcommit}/geometry-test-data-%{testcommit}.tar.gz From 1e571035b40b158d6805febd0778e5a49125c1be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:34:58 +0000 Subject: [PATCH 21/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 61d5fd3..79ecbdd 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 1de31986bae7bc4d5915aa7aee6204db4274a94e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:57:19 +0000 Subject: [PATCH 22/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 79ecbdd..0d3f1d0 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.5.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5d710edf7791fa98f2ea6154881406d7432f8b46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:21:03 +0000 Subject: [PATCH 23/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 0d3f1d0..5641c7c 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.5.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e5d8d013fefcc88fa9a7e0b7306d038aa39078c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:06:13 +0000 Subject: [PATCH 24/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 5641c7c..6291d7d 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.5.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.5.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cfe48ab7a18656fd920b1dbb7feef502f92a381c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:43:52 +0000 Subject: [PATCH 25/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 6291d7d..1854582 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.5.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3696c5862a165d9e70f8b435fc34d20de3d0de7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:16:39 +0000 Subject: [PATCH 26/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index 1854582..e5cf6ff 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.5.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.5.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 211d6ab22f57478619850645f6ebb4874cdad7f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:06:31 +0000 Subject: [PATCH 27/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index e5cf6ff..be00192 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.5.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.5.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c180d36905d2ff2386581725050aaea827a89935 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:40:46 +0000 Subject: [PATCH 28/28] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wagyu.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wagyu.spec b/wagyu.spec index be00192..d10703c 100644 --- a/wagyu.spec +++ b/wagyu.spec @@ -8,7 +8,7 @@ Name: wagyu Version: 0.5.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A general library for geometry operations of union, intersections, difference, and xor License: BSL-1.0 AND BSD-3-Clause @@ -88,6 +88,9 @@ cp -pr include/mapbox %{buildroot}%{_includedir} %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.5.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0.5.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild