diff --git a/35041f4d.patch b/35041f4d.patch new file mode 100644 index 0000000..ae51653 --- /dev/null +++ b/35041f4d.patch @@ -0,0 +1,24 @@ +From 35041f4d9f06f94e4e408a3a12be237d4aa9ef44 Mon Sep 17 00:00:00 2001 +From: Sebastian Freundt +Date: Mon, 12 Dec 2022 08:01:42 +0000 +Subject: [PATCH] test, revert, do not use Singapore for testing previous + transitions + +--- + test/dzone.008.ctst | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/dzone.008.ctst b/test/dzone.008.ctst +index 758401b5..c8c9daa9 100644 +--- a/test/dzone.008.ctst ++++ b/test/dzone.008.ctst +@@ -1,7 +1,7 @@ + #!/usr/bin/clitosis ## -*- shell-script -*- + +-$ dzone --prev Asia/Singapore 2014-02-22 +-1981-12-31T23:30:00+07:30 <- 1982-01-01T00:00:00+08:00 Asia/Singapore ++$ dzone --prev Asia/Jakarta ++1964-01-01T00:00:00+07:30 <- 1963-12-31T23:30:00+07:00 Asia/Jakarta + $ + + ## dzone.008.ctst ends here diff --git a/841c635b.patch b/841c635b.patch new file mode 100644 index 0000000..89ad92a --- /dev/null +++ b/841c635b.patch @@ -0,0 +1,25 @@ +From 841c635bf283e4b023bd98fbff9ebda1f340b024 Mon Sep 17 00:00:00 2001 +From: Sebastian Freundt +Date: Mon, 12 Dec 2022 07:53:31 +0000 +Subject: [PATCH] test, follow tzdata's research on past transitions, fixes + issue #148 + +Singapore's 1981-12-31 change was at 16:00 UTC (23:30 local time), +not 24:00 local time. (Thanks to Geoff Clare via Robert Elz) +--- + test/dzone.008.ctst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/dzone.008.ctst b/test/dzone.008.ctst +index 94d8017e..758401b5 100644 +--- a/test/dzone.008.ctst ++++ b/test/dzone.008.ctst +@@ -1,7 +1,7 @@ + #!/usr/bin/clitosis ## -*- shell-script -*- + + $ dzone --prev Asia/Singapore 2014-02-22 +-1982-01-01T00:00:00+07:30 <- 1982-01-01T00:30:00+08:00 Asia/Singapore ++1981-12-31T23:30:00+07:30 <- 1982-01-01T00:00:00+08:00 Asia/Singapore + $ + + ## dzone.008.ctst ends here diff --git a/dateutils.changes b/dateutils.changes index 25a0542..7ca22be 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Dec 19 13:45:39 UTC 2022 - Dominique Leuenberger + +- Add upstream patches 35041f4d.patch and 841c635b.patch: Do not + use Singapore for testing previous transitions, but rather + Jakarta. Fixes build with timezone 2022g. + ------------------------------------------------------------------- Fri May 27 09:45:49 UTC 2022 - Michael Vetter diff --git a/dateutils.spec b/dateutils.spec index c730e72..9321ffe 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -26,6 +26,8 @@ URL: https://github.com/hroptatyr/dateutils/ Source0: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.asc Source2: %{name}.keyring +Patch0: https://github.com/hroptatyr/dateutils/commit/841c635b.patch +Patch1: https://github.com/hroptatyr/dateutils/commit/35041f4d.patch BuildRequires: octave-devel BuildRequires: pkgconfig BuildRequires: timezone