From 8e0f27dfb1025308bd2212082e6e2b402d02e317 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 15:35:47 +0000 Subject: [PATCH 1/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libzonedetect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libzonedetect.spec b/libzonedetect.spec index 0d8d215..316d72c 100644 --- a/libzonedetect.spec +++ b/libzonedetect.spec @@ -4,7 +4,7 @@ Name: libzonedetect Version: 0~git%{shortcommit} -Release: 8%{?snap}%{?dist} +Release: 9%{?snap}%{?dist} Summary: Find the timezone for a given latitude and longitude # The library is BSD-3, timezone-boundary-builder is MIT, the built database is ODbL-1.0 @@ -133,6 +133,9 @@ cp -a %{SOURCE4} %{buildroot}%{_datadir}/ZoneDetect/ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0~git88e927d-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0~git88e927d-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e4b731586490259ae009d859caef0e78e2a05cc7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 18 Apr 2025 00:41:35 +0200 Subject: [PATCH 2/5] Rebuild against correct crt --- libzonedetect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libzonedetect.spec b/libzonedetect.spec index 0d8d215..c7f595e 100644 --- a/libzonedetect.spec +++ b/libzonedetect.spec @@ -4,7 +4,7 @@ Name: libzonedetect Version: 0~git%{shortcommit} -Release: 8%{?snap}%{?dist} +Release: 9%{?snap}%{?dist} Summary: Find the timezone for a given latitude and longitude # The library is BSD-3, timezone-boundary-builder is MIT, the built database is ODbL-1.0 @@ -133,6 +133,9 @@ cp -a %{SOURCE4} %{buildroot}%{_datadir}/ZoneDetect/ %changelog +* Thu Apr 17 2025 Sandro Mani - 0~git88e927d-9 +- Rebuild against correct crt + * Thu Jul 18 2024 Fedora Release Engineering - 0~git88e927d-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7de6a0156225e9a88fa23511b778cf576c322f4c Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 17 Jul 2025 15:02:25 +0200 Subject: [PATCH 3/5] Increase minimum cmake version, use GNUInstallDirs --- CMakeLists.txt | 13 +++++++------ libzonedetect.spec | 5 ++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef8c2cb..bd1d62d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ -cmake_minimum_required(VERSION 3.0.0) +cmake_minimum_required(VERSION 3.4) project(libzonedetect C) +include(GNUInstallDirs) set(LIBMAJOR 0) set(LIBMINOR 0) @@ -27,11 +28,11 @@ target_link_libraries(ZoneDetect zonedetect) ### Installation install(TARGETS zonedetect - RUNTIME DESTINATION bin - ARCHIVE DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -install(TARGETS ZoneDetect DESTINATION bin) +install(TARGETS ZoneDetect DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(FILES library/zonedetect.h DESTINATION include) +install(FILES library/zonedetect.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/libzonedetect.spec b/libzonedetect.spec index 316d72c..f60b1c6 100644 --- a/libzonedetect.spec +++ b/libzonedetect.spec @@ -4,7 +4,7 @@ Name: libzonedetect Version: 0~git%{shortcommit} -Release: 9%{?snap}%{?dist} +Release: 10%{?snap}%{?dist} Summary: Find the timezone for a given latitude and longitude # The library is BSD-3, timezone-boundary-builder is MIT, the built database is ODbL-1.0 @@ -133,6 +133,9 @@ cp -a %{SOURCE4} %{buildroot}%{_datadir}/ZoneDetect/ %changelog +* Thu Jul 17 2025 Sandro Mani - 0~git88e927d-10 +- Increase minimum cmake version, use GNUInstallDirs + * Fri Jan 17 2025 Fedora Release Engineering - 0~git88e927d-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7d8b9dce09667fc28b626f92ec3d7091b49a0ce8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:40:52 +0000 Subject: [PATCH 4/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libzonedetect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libzonedetect.spec b/libzonedetect.spec index f60b1c6..44420e2 100644 --- a/libzonedetect.spec +++ b/libzonedetect.spec @@ -4,7 +4,7 @@ Name: libzonedetect Version: 0~git%{shortcommit} -Release: 10%{?snap}%{?dist} +Release: 11%{?snap}%{?dist} Summary: Find the timezone for a given latitude and longitude # The library is BSD-3, timezone-boundary-builder is MIT, the built database is ODbL-1.0 @@ -133,6 +133,9 @@ cp -a %{SOURCE4} %{buildroot}%{_datadir}/ZoneDetect/ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0~git88e927d-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 17 2025 Sandro Mani - 0~git88e927d-10 - Increase minimum cmake version, use GNUInstallDirs From b32d0ac86befb310073b48c2eb1572d7b45d62df Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 28 Jul 2025 16:17:36 +0200 Subject: [PATCH 5/5] Update to git 082fa6b --- .gitignore | 1 + ZoneDetect_builddb.patch | 15 +++++++-------- ZoneDetect_cstdint.patch | 11 ----------- ZoneDetect_demo.patch | 6 +++--- libzonedetect.spec | 13 +++++++------ sources | 2 +- 6 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 ZoneDetect_cstdint.patch diff --git a/.gitignore b/.gitignore index eab225c..2940f8e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ne_10m_admin_0_countries_lakes.zip /timezones-with-oceans.shapefile.zip /ZoneDetect-88e927d.tar.gz +/ZoneDetect-082fa6b.tar.gz diff --git a/ZoneDetect_builddb.patch b/ZoneDetect_builddb.patch index 8011dcd..b755cb8 100644 --- a/ZoneDetect_builddb.patch +++ b/ZoneDetect_builddb.patch @@ -1,6 +1,6 @@ -diff -rupN ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/database/builder/makedb.sh ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58-new/database/builder/makedb.sh ---- ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/database/builder/makedb.sh 2022-11-01 15:39:55.000000000 +0100 -+++ ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58-new/database/builder/makedb.sh 2022-12-19 16:00:58.713522467 +0100 +diff -rupN --no-dereference ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c/database/builder/makedb.sh ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c-new/database/builder/makedb.sh +--- ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c/database/builder/makedb.sh 2024-09-13 22:38:34.000000000 +0200 ++++ ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c-new/database/builder/makedb.sh 2025-07-28 16:08:27.870909555 +0200 @@ -4,16 +4,18 @@ set -e g++ builder.cpp --std=c++11 -o builder -lshp @@ -13,16 +13,15 @@ diff -rupN ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/database/builder/ mkdir -p timezone -( --echo https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_admin_0_countries_lakes.zip -o /dev/null -O naturalearth/ne.zip --echo https://github.com/evansiroky/timezone-boundary-builder/releases/download/2022f/timezones-with-oceans.shapefile.zip -o /dev/null -O timezone/tz.zip +-echo https://naciscdn.org/naturalearth/10m/cultural/ne_10m_admin_0_countries_lakes.zip -o /dev/null -O naturalearth/ne.zip +-echo https://github.com/evansiroky/timezone-boundary-builder/releases/download/2024b/timezones-with-oceans.shapefile.zip -o /dev/null -O timezone/tz.zip -) | xargs -n5 -P2 wget +if [ ! -e naturalearth/ne.zip ]; then -+ wget https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_admin_0_countries_lakes.zip -o /dev/null -O naturalearth/ne.zip ++ wget https://naciscdn.org/naturalearth/10m/cultural/ne_10m_admin_0_countries_lakes.zip -o /dev/null -O naturalearth/ne.zip +fi +if [ ! -e timezone/tz.zip ]; then -+ wget https://github.com/evansiroky/timezone-boundary-builder/releases/download/2022f/timezones-with-oceans.shapefile.zip -o /dev/null -O timezone/tz.zip ++ wget https://github.com/evansiroky/timezone-boundary-builder/releases/download/2024b/timezones-with-oceans.shapefile.zip -o /dev/null -O timezone/tz.zip +fi cd naturalearth unzip ne.zip -Binary files ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/database/builder/naturalearth/ne.zip and ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58-new/database/builder/naturalearth/ne.zip differ diff --git a/ZoneDetect_cstdint.patch b/ZoneDetect_cstdint.patch deleted file mode 100644 index c4a4965..0000000 --- a/ZoneDetect_cstdint.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rupN ZoneDetect-88e927d2302966993724f06d57e89cc4bf6d5e35/database/builder/builder.cpp ZoneDetect-88e927d2302966993724f06d57e89cc4bf6d5e35-new/database/builder/builder.cpp ---- ZoneDetect-88e927d2302966993724f06d57e89cc4bf6d5e35/database/builder/builder.cpp 2023-01-19 14:45:32.000000000 +0100 -+++ ZoneDetect-88e927d2302966993724f06d57e89cc4bf6d5e35-new/database/builder/builder.cpp 2023-01-19 23:07:30.654276965 +0100 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/ZoneDetect_demo.patch b/ZoneDetect_demo.patch index e3cdaf4..1b1f0bd 100644 --- a/ZoneDetect_demo.patch +++ b/ZoneDetect_demo.patch @@ -1,6 +1,6 @@ -diff -rupN ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/demo.c ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58-new/demo.c ---- ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58/demo.c 2022-11-01 15:39:55.000000000 +0100 -+++ ZoneDetect-c65bc88db5338daada5b1362a1181aa6e6a4ab58-new/demo.c 2022-12-19 15:20:13.104467759 +0100 +diff -rupN --no-dereference ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c/demo.c ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c-new/demo.c +--- ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c/demo.c 2024-09-13 22:38:34.000000000 +0200 ++++ ZoneDetect-082fa6b14815340d0f0d9e23b1ded318ba77c82c-new/demo.c 2025-07-28 16:08:27.887178600 +0200 @@ -68,6 +68,7 @@ int main(int argc, char *argv[]) { if(argc != 4) { diff --git a/libzonedetect.spec b/libzonedetect.spec index 44420e2..faedbda 100644 --- a/libzonedetect.spec +++ b/libzonedetect.spec @@ -1,10 +1,10 @@ -%global commit 88e927d2302966993724f06d57e89cc4bf6d5e35 +%global commit 082fa6b14815340d0f0d9e23b1ded318ba77c82c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global tz_ver 2022g +%global tz_ver 2024b Name: libzonedetect Version: 0~git%{shortcommit} -Release: 11%{?snap}%{?dist} +Release: 12%{?snap}%{?dist} Summary: Find the timezone for a given latitude and longitude # The library is BSD-3, timezone-boundary-builder is MIT, the built database is ODbL-1.0 @@ -13,7 +13,7 @@ URL: https://github.com/BertoldVdb/ZoneDetect Source0: https://github.com/BertoldVdb/ZoneDetect/archive/%{commit}/ZoneDetect-%{shortcommit}.tar.gz Source1: CMakeLists.txt # For building DB -Source2: https://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/ne_10m_admin_0_countries_lakes.zip +Source2: https://naciscdn.org/naturalearth/10m/cultural/ne_10m_admin_0_countries_lakes.zip Source3: https://github.com/evansiroky/timezone-boundary-builder/releases/download/%{tz_ver}/timezones-with-oceans.shapefile.zip Source4: README.data @@ -21,8 +21,6 @@ Source4: README.data Patch1: ZoneDetect_builddb.patch # Improve help of sample program, fix memory leak Patch2: ZoneDetect_demo.patch -# Add missing cstdint include -Patch3: ZoneDetect_cstdint.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -133,6 +131,9 @@ cp -a %{SOURCE4} %{buildroot}%{_datadir}/ZoneDetect/ %changelog +* Mon Jul 28 2025 Sandro Mani - 0~git082fa6b-12 +- Update to git 082fa6b + * Thu Jul 24 2025 Fedora Release Engineering - 0~git88e927d-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 5645236..bd39626 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (ne_10m_admin_0_countries_lakes.zip) = d2ed7c55d61f7be9f8e0c25add29f35032a5be10809a8485bf1f6e10065a37f2c1b0f8acd698032bc0ff3f53de1748dd3cb28b7176345f18772c71cbb0593216 SHA512 (timezones-with-oceans.shapefile.zip) = 171c09cffca8028b8dabd9e515187c9e8163e4cc74b6cb8376838d1bd3f1836bc8cf89f38aeb51efb1866d6f1e94c419ebfc398e70899775eb7c647d3a2cfaad -SHA512 (ZoneDetect-88e927d.tar.gz) = e0cbdd9574aa81a29d6e3ce5b7094bd01d23bd7619ab2f73a119e58a42815878bc54df0a08e8bcf01ad1ea310ee5082fd3210685a9efb792904c9b1d72113fc5 +SHA512 (ZoneDetect-082fa6b.tar.gz) = 6b90c628887c52a3ff8a39ec78c4dc59ca132e714cbdde263a910d0ce1ec29417f945bbe55432e74b290c94e3af6ab93116cbfbedc3331fc6be06536cadbcd50