diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch new file mode 100644 index 0000000000000000000000000000000000000000..fa905d346d03d47a89e3b4b7ce5c92554b736fed --- /dev/null +++ b/0003-continue-to-ship-posixrules.patch @@ -0,0 +1,13 @@ +diff -Nrup a/Makefile b/Makefile +--- a/Makefile 2023-03-22 17:41:49.069789592 -0400 ++++ b/Makefile 2023-03-22 17:44:07.528427093 -0400 +@@ -52,7 +52,7 @@ LOCALTIME= Factory + # make zonenames + # to get a list of the values you can use for POSIXRULES. + +-POSIXRULES= - ++POSIXRULES= America/New_York + + # Also see TZDEFRULESTRING below, which takes effect only + # if POSIXRULES is '-' or if the template file cannot be accessed. +Binary files a/tzdata2023a-rearguard.tar.gz and b/tzdata2023a-rearguard.tar.gz differ diff --git a/sources b/sources index 42875a3d00fb62dca8b076a977fbb5973940c960..30cf739a48f251b87b1b442441a7d6b3421c8d27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 -SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a +SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 +SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 diff --git a/tzdata-china.diff b/tzdata-china.diff index 97602cfb093e8e3564d19aa35d7f25c8a5b7140b..4a710e3ef4712289c94b9b54f0b69b38ba752a36 100644 --- a/tzdata-china.diff +++ b/tzdata-china.diff @@ -28,7 +28,7 @@ Index: timezone-2022f/zone1970.tab --- timezone-2022f.orig/zone1970.tab +++ timezone-2022f/zone1970.tab @@ -124,6 +124,7 @@ CK -2114-15946 Pacific/Rarotonga - CL -3327-07040 America/Santiago Chile (most areas) + CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island +CN +3955+11626 Asia/Beijing China Standard Time diff --git a/tzdata.spec b/tzdata.spec index befadf4e0291cb48a60d51fd5d175a815e1449f6..a464095e0541d363b9fe3d38c65ae3eb4e251a82 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,13 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2022g -Release: 3%{?dist} +Version: 2023c +Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz Patch3000: tzdata-china.diff Patch3001: 0002-Fix-have-snprintf-error.patch +Patch3002: 0003-continue-to-ship-posixrules.patch BuildRequires: make, glibc BuildRequires: gawk, perl-interpreter, glibc-common >= 2.5.90-7 @@ -59,6 +60,9 @@ install -p -m 644 zone.tab zone1970.tab iso3166.tab leap-seconds.list leapsecond %changelog +* Thu Jul 13 2023 Wang Guodong - 2023c-1 +- Upgrade to 2023c + * Fri Apr 28 2023 OpenCloudOS Release Engineering - 2022g-3 - Rebuilt for OpenCloudOS Stream 23.05