| |
@@ -3,7 +3,7 @@
|
| |
Version: 2024a
|
| |
%define tzdata_version 2024a
|
| |
%define tzcode_version 2024a
|
| |
- Release: 5%{?dist}
|
| |
+ Release: 6%{?dist}
|
| |
License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0)
|
| |
URL: https://www.iana.org/time-zones
|
| |
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
|
| |
@@ -20,6 +20,9 @@
|
| |
BuildArchitectures: noarch
|
| |
ExcludeArch: i686
|
| |
|
| |
+ # Using '--with vanguard' will change the data format to the new vanguard form.
|
| |
+ %bcond_with vanguard
|
| |
+
|
| |
%description
|
| |
This package contains data files with rules for various timezones around
|
| |
the world.
|
| |
@@ -50,7 +53,7 @@
|
| |
popd
|
| |
|
| |
%if 0%{?rhel}
|
| |
- # Use rearguard for rhel (overwrite default vangaurd data)
|
| |
+ # Use rearguard for rhel (overwrite default dataform)
|
| |
tar zxf rearguard/tzdata%{version}-rearguard.tar.gz
|
| |
%endif
|
| |
|
| |
@@ -62,7 +65,9 @@
|
| |
%build
|
| |
# Run make to create the tzdata.zi file
|
| |
rm tzdata.zi
|
| |
- %if 0%{?rhel}
|
| |
+ %if %{with vanguard}
|
| |
+ make VERSION=%{version} DATAFORM=vanguard tzdata.zi
|
| |
+ %elif 0%{?rhel}
|
| |
make VERSION=%{version} DATAFORM=rearguard tzdata.zi
|
| |
%else
|
| |
make tzdata.zi
|
| |
@@ -114,6 +119,9 @@
|
| |
%{_datadir}/javazi-1.8
|
| |
|
| |
%changelog
|
| |
+ * Fri Apr 26 2024 Jonathan Wakely <jwakely@redhat.com> - 2024a-6
|
| |
+ - Add support for --with vanguard
|
| |
+
|
| |
* Thu Apr 04 2024 Patsy Griffin <patsy@redhat.com> - 2024a-5
|
| |
- Add java patch to fix incorrect calculations for
|
| |
Africa/Casablanca starting in 2027. (#2266311)
|
| |