[rpms/osm2pgsql] rawhide: Update to 2.3.0 upstream release

[rpms/osm2pgsql] rawhide: Update to 2.3.0 upstream release

[Tom Hughes]

A new commit has been pushed.

Repo   : rpms/osm2pgsql
Branch : rawhide
Commit : 742702994ca803f0654f80c711076659734ce5ad
Author : Tom Hughes <tom@compton.nu>
Date   : 2026-06-11T14:37:10+01:00
Stats  : +4/-51 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/osm2pgsql/c/742702994ca803f0654f80c711076659734ce5ad?branch=rawhide

Log:
Update to 2.3.0 upstream release

---
diff --git a/.gitignore b/.gitignore
index 1fb022e..65bbd1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /osm2pgsql-2.1.0.tar.gz
 /osm2pgsql-2.1.1.tar.gz
 /osm2pgsql-2.2.0.tar.gz
+/osm2pgsql-2.3.0.tar.gz

diff --git a/osm2pgsql-fmt12-localtime.patch b/osm2pgsql-fmt12-localtime.patch
deleted file mode 100644
index cc855c8..0000000
--- a/osm2pgsql-fmt12-localtime.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From dec29373b408915a140d128abed4c10ff2131156 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Fri, 3 Apr 2026 14:58:10 +0800
-Subject: [PATCH] Replace fmt::localtime with portable thread-safe equivalent
-
-fmt::localtime was removed in fmt 12. Replace it with an equivalent
-that is thread-safe and portable:
-- POSIX: localtime_r(&time, &tm)
-- MSVC:  localtime_s(&tm, &time)  (reversed argument order)
-
-Both are re-entrant and thread-safe, matching the guarantee that
-fmt::localtime provided.
-
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
----
- src/logging.cpp | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/logging.cpp b/src/logging.cpp
-index 95ed5f8..b4ecf34 100644
---- a/src/logging.cpp
-+++ b/src/logging.cpp
-@@ -27,8 +27,18 @@ void logger_t::generate_common_prefix(std::string *str,
-                                       fmt::text_style const &ts,
-                                       char const *prefix) const
- {
--    *str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
--                        fmt::localtime(std::time(nullptr)));
-+    auto const now = std::time(nullptr);
-+    std::tm tm_local{};
-+#ifdef _MSC_VER
-+    if (localtime_s(&tm_local, &now) != 0) {
-+        throw fmt::format_error("time_t value out of range");
-+    }
-+#else
-+    if (!localtime_r(&now, &tm_local)) {
-+        throw fmt::format_error("time_t value out of range");
-+    }
-+#endif
-+    *str += fmt::format("{:%F %T}  ", tm_local);
- 
-     if (m_current_level == log_level::debug) {
-         *str += fmt::format(ts, "[{:02d}] ", this_thread_num);
--- 
-2.47.3
-

diff --git a/osm2pgsql.spec b/osm2pgsql.spec
index 9afd9ee..f300b3d 100644
--- a/osm2pgsql.spec
+++ b/osm2pgsql.spec
@@ -5,15 +5,13 @@
 %global protozero_version 1.7.1
 
 Name:           osm2pgsql
-Version:        2.2.0
+Version:        2.3.0
 Release:        %autorelease
 Summary:        Import map data from OpenStreetMap to a PostgreSQL database
 
 License:        GPL-2.0-or-later
 URL:            https://osm2pgsql.org/
 Source0:        https://github.com/osm2pgsql-dev/osm2pgsql/archive/%{version}/%{name}-%{version}.tar.gz
-# https://github.com/osm2pgsql-dev/osm2pgsql/pull/2457
-Patch0:         osm2pgsql-fmt12-localtime.patch
 
 ExcludeArch:    %{ix86}
 
@@ -45,7 +43,7 @@ BuildRequires:  postgis
 BuildRequires:  python3
 BuildRequires:  python3-behave
 BuildRequires:  python3-osmium
-BuildRequires:  python3-psycopg2
+BuildRequires:  python3-psycopg3
 
 %description
 Provides a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS

diff --git a/sources b/sources
index 548e2dd..f8d6522 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osm2pgsql-2.2.0.tar.gz) = 873d6fb6470f2a61ec5243e20faa556739122de55b90770ab8df62d3a86a9751875e1f036c3fca3836354c39a690729f712265df1151f169ed988589139e5cb2
+SHA512 (osm2pgsql-2.3.0.tar.gz) = 8a8753ebe3cccf3a3ea17105ece9b290776a25df3b4f6db0f5ccff386fabef445c3dbb999cc9aa4b84071a2f6bf154d37eb1f62fb1d85b7ef91f8a9a2cd8915c