diff --git a/backport-No-leap-second-on-2021-06-30.patch b/backport-No-leap-second-on-2021-06-30.patch deleted file mode 100644 index 9158645..0000000 --- a/backport-No-leap-second-on-2021-06-30.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 500141665b78279e47f614dc1acfd77b845a4578 Mon Sep 17 00:00:00 2001 -From: Tim Parenti -Date: Sat, 9 Jan 2021 13:59:02 -0500 -Subject: [PATCH] No leap second on 2021-06-30 - -Per IERS Bulletin C 61 (2021-01-07). -https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.61 - -* leap-seconds.list: Update file from NIST, retrieved from -ftp://ftp.nist.gov/pub/time/leap-seconds.list ---- - leap-seconds.list | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/leap-seconds.list b/leap-seconds.list -index e897a86..3198d65 100644 ---- a/leap-seconds.list -+++ b/leap-seconds.list -@@ -204,10 +204,10 @@ - # current -- the update time stamp, the data and the name of the file - # will not change. - # --# Updated through IERS Bulletin C60 --# File expires on: 28 June 2021 -+# Updated through IERS Bulletin C61 -+# File expires on: 28 December 2021 - # --#@ 3833827200 -+#@ 3849638400 - # - 2272060800 10 # 1 Jan 1972 - 2287785600 11 # 1 Jul 1972 -@@ -252,4 +252,4 @@ - # the hash line is also ignored in the - # computation. - # --#h 064356a8 39268b92 76e4d5ef 3e22fae1 0cca529c -+#h 2ab8253d d4380d28 75f01343 381504f8 8f8a4bfc --- -1.8.3.1 - diff --git a/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch b/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch deleted file mode 100644 index 90315f6..0000000 --- a/backport-South-Sudan-changes-from-03-to-02-on-2021-02-01.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7d7a4fb5bdaf778d48903b56d4200dd84282238e Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Tue, 19 Jan 2021 13:17:42 -0800 -Subject: [PATCH] South Sudan changes from +03 to +02 on 2021-02-01. - -(Thanks to Steffen Thorsen.) -* NEWS: Mention this. -* africa (Africa/Juba): Implement it. ---- - NEWS | 7 +++++++ - africa | 8 +++++++- - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 19470cc..13c87b0 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,6 +2,13 @@ News for the tz database - - Release 2020f - 2020-12-29 00:17:46 -0800 - -+ Briefly: -+ South Sudan changes from +03 to +02 on 2021-02-01. -+ -+ Changes to future timestamps -+ South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. -+ (Thanks to Steffen Thorsen.) -+ - Change to build procedure - - 'make rearguard_tarballs' no longer generates a bad rearguard.zi, -diff --git a/africa b/africa -index 59cf501..28168cf 100644 ---- a/africa -+++ b/africa -@@ -1527,11 +1527,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 - 3:00 - EAT 2017 Nov 1 - 2:00 - CAT - -+# From Steffen Thorsen (2021-01-18): -+# "South Sudan will change its time zone by setting the clock back 1 -+# hour on February 1, 2021...." -+# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/ -+ - # South Sudan - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Africa/Juba 2:06:28 - LMT 1931 - 2:00 Sudan CA%sT 2000 Jan 15 12:00 -- 3:00 - EAT -+ 3:00 - EAT 2021 Feb 1 00:00 -+ 2:00 - CAT - - # Tanzania - # See Africa/Nairobi. --- -1.8.3.1 - diff --git a/tzdata.spec b/tzdata.spec index 1f08dc6..d2eaffd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2021a -Release: 1 +Release: 2 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -103,6 +103,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon May 8 2021 liuchao - 2021a-2 +- Remove useless patches + * Tue Jan 26 2021 liuchao - 2021a-1 - Upgrade to 2021a