diff --git a/.gitignore b/.gitignore index 919dffb..dc02e88 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /osm2pgsql-1.9.1.tar.gz /osm2pgsql-1.9.2.tar.gz /osm2pgsql-1.10.0.tar.gz +/osm2pgsql-1.11.0.tar.gz diff --git a/osm2pgsql.spec b/osm2pgsql.spec index 7ef19ca..7b8a621 100644 --- a/osm2pgsql.spec +++ b/osm2pgsql.spec @@ -1,6 +1,12 @@ +%global catch_version 2.13.10 +%global cli11_version 2.4.1 +%global fmt_version 10.2.1 +%global libosmium_version 2.20.0 +%global protozero_version 1.7.1 + Name: osm2pgsql -Version: 1.10.0 -Release: 5%{?dist} +Version: 1.11.0 +Release: 1%{?dist} Summary: Import map data from OpenStreetMap to a PostgreSQL database License: GPL-2.0-or-later @@ -15,16 +21,20 @@ BuildRequires: cmake BuildRequires: libtool BuildRequires: boost-devel BuildRequires: bzip2-devel -BuildRequires: catch2-devel catch2-static +BuildRequires: catch2-devel >= %{catch_version} +BuildRequires: catch2-static >= %{catch_version} +BuildRequires: cli11-devel >= %{cli11_version} +BuildRequires: cli11-static >= %{cli11_version} BuildRequires: expat-devel -BuildRequires: fmt-devel +BuildRequires: fmt-devel >= %{fmt_version} BuildRequires: json-devel -BuildRequires: libosmium-devel +BuildRequires: libosmium-devel >= %{libosmium_version} BuildRequires: libpq-devel BuildRequires: libxml2-devel BuildRequires: lua-devel BuildRequires: proj-devel -BuildRequires: protozero-devel protozero-static +BuildRequires: protozero-devel >= %{protozero_version} +BuildRequires: protozero-static >= %{protozero_version} BuildRequires: zlib-devel BuildRequires: postgresql BuildRequires: postgresql-contrib @@ -48,6 +58,7 @@ ln -sf /usr/include/catch2 contrib/catch2/include %build %cmake \ + -DEXTERNAL_CLI11=ON \ -DEXTERNAL_FMT=ON \ -DEXTERNAL_LIBOSMIUM=ON \ -DEXTERNAL_PROTOZERO=ON \ @@ -71,6 +82,9 @@ LANG="C.UTF-8" %ctest -j1 %{_datadir}/%{name}/ %changelog +* Tue Feb 13 2024 Tom Hughes - 1.11.0-1 +- Update to 1.11.0 upstream release + * Mon Jan 29 2024 Fedora Release Engineering - 1.10.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 0586fcf..b4f448d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (osm2pgsql-1.10.0.tar.gz) = 26d1a4d509dc84a945746c7d51638c5d4219495888898824209929acd9323e47a0c215d935a07df2d3edbdbc138ecfdf1ef74ca4165667d98a13a3b353579b27 +SHA512 (osm2pgsql-1.11.0.tar.gz) = 91df5a0428d9fc67c3830b9f6ac5de9cfe5b6dfee2980bb6807d3fe1796e040749c990ca696aa9462bf1e16f9c4fd95047ce1d4f71ae6c22f0d124f9cbeda430