SLFO-pool/timezone
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main timezone revision 84d2a4aa551e7107b09c83138d5df9ba

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-04 01:24:38 +02:00
commit c4fffb60ce
17 changed files with 12223 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

4
_multibuild Normal file
View File

@ -0,0 +1,4 @@
<multibuild>
<package>timezone-java</package>
</multibuild>

13
fat.patch Normal file
View File

@ -0,0 +1,13 @@
Index: timezone-2022f/Makefile
===================================================================
--- timezone-2022f.orig/Makefile
+++ timezone-2022f/Makefile
@@ -406,7 +406,7 @@ ZIC= $(zic) $(ZFLAGS)
# possibly at the expense of introducing bugs in newer ones,
# append "-b fat"; see ZIC_BLOAT_DEFAULT above.
# See the zic man page for more about -b and -r.
-ZFLAGS=
+ZFLAGS=-b fat
# How to use zic to install TZif files.

13
iso3166-uk.diff Normal file
View File

@ -0,0 +1,13 @@
Index: timezone-2016b/iso3166.tab
===================================================================
--- timezone-2016b.orig/iso3166.tab
+++ timezone-2016b/iso3166.tab
@@ -99,7 +99,7 @@ FM Micronesia
FO Faroe Islands
FR France
GA Gabon
-GB Britain (UK)
+GB United Kingdom
GD Grenada
GE Georgia
GF French Guiana

12
pre_checkin.sh Normal file
View File

@ -0,0 +1,12 @@
#!/bin/bash
# This script is called automatically during autobuild checkin.
ln -f timezone.changes timezone-java.changes
for spec in timezone-java.spec; do
{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in
sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' timezone.spec
sed -n -e '/COMMON-END/,/COMMON-PREP-BEGIN/p' $spec.in
sed -n -e '/COMMON-PREP-BEGIN/,/COMMON-PREP-END/p' timezone.spec
sed -n -e '/COMMON-PREP-END/,$p' $spec.in; } > $spec.tmp && mv $spec.tmp $spec
done

33
timezone-2018f-bsc1112310.patch Normal file
View File

@ -0,0 +1,33 @@
From: Andreas Stieger <astieger@suse.com>
References: https://bugzilla.suse.com/show_bug.cgi?id=1112310
Summary: avoid timezone-java build failures
Date: Thu, 18 Oct 2018 13:19:51 +0000
javazic is unable to parse the time zone data contained in 2018f:
https://github.com/eggert/tz/compare/2018e...2018f#diff-cffe819d4413b95dd8c35c0085930789R1656
- Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S
+ Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S
Base:System/timezone (timezone-java.spec) fails with:
[ 16s] + java -jar /usr/share/java/tzdb.jar -srcdir . -dstfile javazi/tzdb.dat africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera systemv /usr/share/tzdb/tzdata_jdk/gmt /usr/share/tzdb/tzdata_jdk/jdk11_backward
[ 16s] Failed: java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S'
[ 16s] java.lang.Exception: Failed while parsing file './asia' on line 1659 'Rule Japan 1948 1951 - Sep Sat>=8 25:00 0S'
The bug is actually in Java. Use an alternative format to fix build.
Index: timezone-2020b/asia
===================================================================
--- timezone-2020b.orig/asia
+++ timezone-2020b/asia
@@ -2021,7 +2021,7 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
-Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S
+Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S
Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D

5851
timezone-java.changes Normal file
View File

File diff suppressed because it is too large Load Diff

95
timezone-java.spec Normal file
View File

@ -0,0 +1,95 @@
#
# spec file for package timezone-java
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: timezone-java
BuildRequires: java
BuildRequires: javazic
BuildRequires: tzdb
Summary: Time Zone Descriptions
License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-BEGIN
Version: 2023c
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
Source2: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz.asc
Source3: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz.asc
Source4: timezone.keyring
Source5: %{name}.changes
Patch0: tzdata-china.diff
Patch3: iso3166-uk.diff
Patch4: timezone-2018f-bsc1112310.patch
Patch5: fat.patch
# COMMON-END
# COMMON-END
URL: https://www.iana.org/time-zones
Requires(pre): filesystem, coreutils
Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release}
#!BuildIgnore: tzdata-java tzdata-java8
BuildArch: noarch
%description
These are configuration files that describe available time zones - this
package is intended for Java Virtual Machine based on OpenJDK.
%prep
%setup -c -a 1
# COMMON-PREP-BEGIN
# COMMON-PREP-BEGIN
%patch0 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
# COMMON-PREP-END
# COMMON-PREP-END
echo "tzdata%{version}" >> VERSION
%build
# Java 6/7 data
java \
%if %{?pkg_vcmp:%pkg_vcmp java >= 9}%{!?pkg_vcmp:0}
--add-exports=java.base/sun.security.action=ALL-UNNAMED \
%endif
-jar %{_javadir}/javazic.jar -V %{version} \
-d javazi \
africa antarctica asia australasia europe northamerica \
southamerica backward etcetera \
%{_datadir}/javazic/tzdata_jdk/gmt \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward
# Java 8/9 data
java -jar %{_javadir}/tzdb.jar \
-srcdir . -dstfile javazi/tzdb.dat \
africa antarctica asia australasia europe northamerica \
southamerica backward etcetera \
%{_datadir}/tzdb/tzdata_jdk/gmt \
%{_datadir}/tzdb/tzdata_jdk/jdk11_backward
%install
install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
cp -a javazi $RPM_BUILD_ROOT%{_datadir}
%files
%defattr(-,root,root)
%{_datadir}/javazi
%changelog

76
timezone-java.spec.in Normal file
View File

@ -0,0 +1,76 @@
#
# spec file for package timezone-java
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: timezone-java
BuildRequires: java
BuildRequires: javazic
BuildRequires: tzdb
Summary: Time Zone Descriptions
License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-END
URL: https://www.iana.org/time-zones
Requires(pre): filesystem, coreutils
Provides: tzdata-java = %{version}-%{release}
Provides: tzdata-java8 = %{version}-%{release}
#!BuildIgnore: tzdata-java tzdata-java8
BuildArch: noarch
%description
These are configuration files that describe available time zones - this
package is intended for Java Virtual Machine based on OpenJDK.
%prep
%setup -c -a 1
# COMMON-PREP-BEGIN
# COMMON-PREP-END
echo "tzdata%{version}" >> VERSION
%build
# Java 6/7 data
java \
%if %{?pkg_vcmp:%pkg_vcmp java >= 9}%{!?pkg_vcmp:0}
--add-exports=java.base/sun.security.action=ALL-UNNAMED \
%endif
-jar %{_javadir}/javazic.jar -V %{version} \
-d javazi \
africa antarctica asia australasia europe northamerica \
southamerica backward etcetera \
%{_datadir}/javazic/tzdata_jdk/gmt \
%{_datadir}/javazic/tzdata_jdk/jdk11_backward
# Java 8/9 data
java -jar %{_javadir}/tzdb.jar \
-srcdir . -dstfile javazi/tzdb.dat \
africa antarctica asia australasia europe northamerica \
southamerica backward etcetera \
%{_datadir}/tzdb/tzdata_jdk/gmt \
%{_datadir}/tzdb/tzdata_jdk/jdk11_backward
%install
install -d -m 0755 $RPM_BUILD_ROOT/%{_datadir}
cp -a javazi $RPM_BUILD_ROOT%{_datadir}
%files
%defattr(-,root,root)
%{_datadir}/javazi
%changelog

5851
timezone.changes Normal file
View File

File diff suppressed because it is too large Load Diff

75
timezone.keyring Normal file
View File

@ -0,0 +1,75 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
=sOm2
-----END PGP PUBLIC KEY BLOCK-----

102
timezone.spec Normal file
View File

@ -0,0 +1,102 @@
#
# spec file for package timezone
#
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: timezone
Summary: Time Zone Descriptions
License: BSD-3-Clause AND SUSE-Public-Domain
Group: System/Base
URL: http://www.iana.org/time-zones
# COMMON-BEGIN
Version: 2023c
Release: 0
Source: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz
Source1: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz
Source2: https://www.iana.org/time-zones/repository/releases/tzdata%{version}.tar.gz.asc
Source3: https://www.iana.org/time-zones/repository/releases/tzcode%{version}.tar.gz.asc
Source4: timezone.keyring
Source5: %{name}.changes
Patch0: tzdata-china.diff
Patch3: iso3166-uk.diff
Patch4: timezone-2018f-bsc1112310.patch
Patch5: fat.patch
# COMMON-END
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global AREA Etc
%global ZONE UTC
%description
These are configuration files that describe available time zones. You
can select an appropriate time zone for your system with YaST.
%prep
%setup -q -c -a 1
# COMMON-PREP-BEGIN
%patch0 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358]
# COMMON-PREP-END
touch version
%build
unset ${!LC_*}
LANG=POSIX
LC_ALL=POSIX
AREA=%{AREA}
ZONE=%{ZONE}
export AREA LANG LC_ALL ZONE
make %{?_smp_mflags} TZDIR=%{_datadir}/zoneinfo CFLAGS="%{optflags} -DHAVE_GETTEXT=1 -DTZDEFAULT='\"/etc/localtime\"' -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -Dlint" AWK=awk BUGEMAIL="opensuse-support@opensuse.org"
make %{?_smp_mflags} TZDIR=zoneinfo AWK=awk zones
# Generate posixrules
./zic -b fat -y ./yearistype -d zoneinfo -p %{AREA}/%{ZONE}
%install
mkdir -p %{buildroot}%{_prefix}/share/zoneinfo
cp -a zoneinfo %{buildroot}%{_prefix}/share/zoneinfo/posix
cp -al %{buildroot}%{_prefix}/share/zoneinfo/posix/. %{buildroot}%{_prefix}/share/zoneinfo
cp -a zoneinfo-leaps %{buildroot}%{_prefix}/share/zoneinfo/right
mkdir -p %{buildroot}/etc
rm -f %{buildroot}/etc/localtime
rm -f %{buildroot}%{_prefix}/share/zoneinfo/posixrules
%if 0%{?suse_version} >= 1230
ln -sf %{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime
%else
cp -fp %{buildroot}%{_prefix}/share/zoneinfo/%{AREA}/%{ZONE} %{buildroot}/etc/localtime
%endif
ln -sf /etc/localtime %{buildroot}%{_prefix}/share/zoneinfo/posixrules
install -m 644 iso3166.tab %{buildroot}%{_prefix}/share/zoneinfo/iso3166.tab
install -m 644 zone.tab %{buildroot}%{_prefix}/share/zoneinfo/zone.tab
install -m 644 zone1970.tab %{buildroot}%{_prefix}/share/zoneinfo/zone1970.tab
install -m 644 tzdata.zi %{buildroot}%{_prefix}/share/zoneinfo/tzdata.zi
install -D -m 755 tzselect %{buildroot}%{_bindir}/tzselect
install -D -m 755 zdump %{buildroot}%{_sbindir}/zdump
install -D -m 755 zic %{buildroot}%{_sbindir}/zic
install -m 644 -t %{buildroot}%{_datadir}/zoneinfo/ leapseconds leapseconds.awk leap-seconds.list
%files
%defattr(-,root,root)
%verify(not link md5 size mtime) %config(missingok,noreplace) /etc/localtime
%{_datadir}/zoneinfo
%{_bindir}/tzselect
%{_sbindir}/zdump
%{_sbindir}/zic
%changelog

BIN
tzcode2023c.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
tzcode2023c.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQjQ8MACgkQ7ZfpDmKq
fjTp4BAAvitWlH49WQ+Cfs//1bBy7ifW1I5PNXSZFIDSNsZUGhrXOkZ/b6l3jAEF
Z76GL7PQb5d/QHdKAIYeDheGnGf/8Wh4PFGzBkiyZgEdeZk6QLtE1n71Fu1x7gca
IQOmVTzwVAf9f+fbizsaTarqg30TnPzUsuHiljInOaV8GkTt0VUkIZ5LeH09kdpY
Rq6BIiehGikkBLyvCpyCTGZ4H8IKgR0GMkIHWQwj0mw/WROnT+xAfzTUrtD7zJK2
5+Ek2kj0UDB9DbprIkCZyh56W1OZ4m5OuAd9wHdx1ZOPfE6jq0lm+2B2kX4759mQ
U66wyATu1qqqlc/2HUe464SWCyNTEDGbCCygfryInKd9Y+QORhK9yOsDfskVcGgX
qTE2U20YzMqHP34fgTUsOC+mQ9e+qR1CvnCGAv3y1wpUIj1r9Opq7cI1uCvVE6xn
nJhU1oE+z4HjhT2TZSS+gVM8D6p+z096sOkRnFg+mIh7XzSYYSFRojcGLnSAkg+o
K68yPfXPu0subUGi5dH1XLQQYM0v0sqCATu5jKwU4YyyHoUuWDi9mooReAkSaj+y
KON+VuYMRZZfJqzdc0HcXUsqlY/nK6/INRbtgvEKlMRLBn5oGbWIRnlyQvJA814v
fsaewl80tRZAtXs/hwHrSGX1vxMkMaaDk5frG9BG/EkupBZa/rk=
=fwRN
-----END PGP SIGNATURE-----

37
tzdata-china.diff Normal file
View File

@ -0,0 +1,37 @@
Index: timezone-2023a/asia
===================================================================
--- timezone-2023a.orig/asia
+++ timezone-2023a/asia
@@ -653,6 +653,8 @@ Rule PRC 1987 1991 - Apr Sun>=11 2:00 1
Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 Shang C%sT 1949 May 28
8:00 PRC C%sT
+
+Link Asia/Shanghai Asia/Beijing
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
# Vostok base in Antarctica matches this since 1970.
Index: timezone-2023a/zone.tab
===================================================================
--- timezone-2023a.orig/zone.tab
+++ timezone-2023a/zone.tab
@@ -142,6 +142,7 @@ CL -3327-07040 America/Santiago most of
CL -5309-07055 America/Punta_Arenas Region of Magallanes
CL -2709-10926 Pacific/Easter Easter Island
CM +0403+00942 Africa/Douala
+CN +3955+11626 Asia/Beijing China Standard Time
CN +3114+12128 Asia/Shanghai Beijing Time
CN +4348+08735 Asia/Urumqi Xinjiang Time
CO +0436-07405 America/Bogota
Index: timezone-2023a/zone1970.tab
===================================================================
--- timezone-2023a.orig/zone1970.tab
+++ timezone-2023a/zone1970.tab
@@ -125,6 +125,7 @@ CK -2114-15946 Pacific/Rarotonga
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
CN +3114+12128 Asia/Shanghai Beijing Time
CN,AQ +4348+08735 Asia/Urumqi Xinjiang Time, Vostok
CO +0436-07405 America/Bogota

BIN
tzdata2023c.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

16
tzdata2023c.tar.gz.asc Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmQjQ8MACgkQ7ZfpDmKq
fjScAg/+LKVw3MFKXvXhDAJX9FPL+ZtvFc+XCwkAxylFA8rrLYjNTo+X7vdyu/AV
1YSkQFqPrPJrVMlffRm/NaQI59vOhkIQZ4Ingd0IFzfHIJMSMVU1C359mpUnxgce
XLLUA12+Mjo3SEO/QYOZLhkpvzoJ2loPdgAUtraysunZdgYVdOubd8EpbWtZ/d9u
cdKJriVWaHwcmEPXmZOcAhjTA2immhIrAd4G1FzuHFJNjdjIzJyXzxATWEk3mQ0z
ZOQcpWGzf50OL9Atri4e8Nm4mXjguQHRebfYv8QVHAvxcdjGFc5yqvVrwGaNLGtV
oadxHA3J/hmWS7mg7/pYDKabTNeoXrXWEzY8VXRbPnfvtbUXh9g4t9JDlgocHpQQ
wAC3Hb/mvMFON68aCPWQeHxcHXOrAm2KHlGblJA9iI364S6v3iK7gd16lzZSbuTy
G8jAt7YUilZxyIIV0GVMjQD9oG6bVm6ApccVVIBPHqlW1J09ON0koWRiNGqdbr8F
BTh3ORBCo0qU+BvYF6mL9SCIrbGUvr4NdwY9aKaB04HPZz244fD2kLPt1z5v+7K6
cQrhdVQ6CqejhlJXRm4cQdeEzJhgxw+cFc256e8WpoofVu5rDws2d2KQZkqHGiFH
A5jSKg2PWfZcqPoTdRg19DlUUdDBH8xybXzK5ExjHdDDO7KInGU=
=XC0E
-----END PGP SIGNATURE-----