- Rebase to 2014a
  - Turkey begins DST on 2014-03-31, not 03-30.
This commit is contained in:
Patsy Franklin 2014-03-12 13:27:21 -04:00
parent f5ae10705f
commit 1198dd34ba
3 changed files with 20 additions and 12 deletions

2
.gitignore vendored
View File

@ -99,3 +99,5 @@ noarch/
/tzdata2013h.tar.gz /tzdata2013h.tar.gz
/tzcode2013i.tar.gz /tzcode2013i.tar.gz
/tzdata2013i.tar.gz /tzdata2013i.tar.gz
/tzdata2014a.tar.gz
/tzcode2014a.tar.gz

View File

@ -1,3 +1,3 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
acee8e586bf125109f64c4911cfc82f6 tzcode2013i.tar.gz 423a11bcffc10dda578058cf1587d048 tzdata2014a.tar.gz
778b4ca53a7cdf61d5147bef328f02b8 tzdata2013i.tar.gz 77ccbb720f0f2076f12dff6ded70eb98 tzcode2014a.tar.gz

View File

@ -1,15 +1,16 @@
Summary: Timezone data Summary: Timezone data
Name: tzdata Name: tzdata
Version: 2013i Version: 2014a
%define tzdata_version 2013i %define tzdata_version 2014a
%define tzcode_version 2013i %define tzcode_version 2014a
Release: 2%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
Patch1: 001-tzdata-fiji-dst.patch # Add new patches here...
# Patch1: your-new-patch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gawk, glibc, perl BuildRequires: gawk, glibc, perl
@ -35,7 +36,8 @@ This package contains timezone information for use by Java runtimes.
%prep %prep
%setup -q -c -a 1 %setup -q -c -a 1
%patch1 -p1 # Add new patches here...
# %patch1 -p1
mkdir javazic mkdir javazic
tar zxf %{SOURCE3} -C javazic tar zxf %{SOURCE3} -C javazic
@ -57,7 +59,7 @@ popd
%build %build
FILES="africa antarctica asia australasia europe northamerica southamerica FILES="africa antarctica asia australasia europe northamerica southamerica
pacificnew etcetera backward" pacificnew etcetera backward"
mkdir zoneinfo/{,posix,right} mkdir zoneinfo/{,posix,right}
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/javazi %{_datadir}/javazi
%changelog %changelog
* Wed Mar 12 2014 Patsy Franklin <pfrankli@redhat.com> 2014a-1
- Rebase to 2014a
- Turkey begins DST on 2014-03-31, not 03-30.
* Tue Jan 21 2014 Patsy Franklin <pfrankli@redhat.com> 2013i-2 * Tue Jan 21 2014 Patsy Franklin <pfrankli@redhat.com> 2013i-2
- Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. - Fiji ends DST on 2014-01-19 at 02:00, not the previously scheduled 03:00.
@ -573,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
- Upstream 2008d - Upstream 2008d
- Changes for Brazil and Mauritius - Changes for Brazil and Mauritius
* Wed May 30 2008 Petr Machata <pmachata@redhat.com> - 2008c-1 * Fri May 30 2008 Petr Machata <pmachata@redhat.com> - 2008c-1
- Upstream 2008c - Upstream 2008c
- Mongolia changes zone - Mongolia changes zone
- Pakistan DST is scheduled until Sep/1, instead of Aug/31 - Pakistan DST is scheduled until Sep/1, instead of Aug/31
@ -618,7 +624,7 @@ rm -rf $RPM_BUILD_ROOT
- Iran will resume DST next year - Iran will resume DST next year
- Venezuela is scheduled to change TZ to -4:30 on January 1 - Venezuela is scheduled to change TZ to -4:30 on January 1
* Thu Sep 25 2007 Keith Seitz <keiths@redhat.com> - 2007g-2 * Tue Sep 25 2007 Keith Seitz <keiths@redhat.com> - 2007g-2
- Add support for building java's zoneinfo files in new - Add support for building java's zoneinfo files in new
tzdata-java RPM. tzdata-java RPM.
@ -757,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Mar 16 2006 Petr Machata <pmachata@redhat.com> - 2006b-2 * Thu Mar 16 2006 Petr Machata <pmachata@redhat.com> - 2006b-2
- Patch for Sri Lanka time zone change (#184514) - Patch for Sri Lanka time zone change (#184514)
* Thu Feb 22 2006 Petr Machata <pmachata@redhat.com> 2006b-1 * Wed Feb 22 2006 Petr Machata <pmachata@redhat.com> 2006b-1
- Upstream 2006b: - Upstream 2006b:
- using tz64code version, as 32 is legacy according to tzdata ML - using tz64code version, as 32 is legacy according to tzdata ML
- new manual pages for ctime, strftime, tzset - new manual pages for ctime, strftime, tzset