From 1198dd34ba1f9cb6194caa1848af5a1243401fbe Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mar 12 2014 17:27:21 +0000 Subject: Resolves: #1075002 - Rebase to 2014a - Turkey begins DST on 2014-03-31, not 03-30. --- diff --git a/.gitignore b/.gitignore index e34b94c..27050e4 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,5 @@ noarch/ /tzdata2013h.tar.gz /tzcode2013i.tar.gz /tzdata2013i.tar.gz +/tzdata2014a.tar.gz +/tzcode2014a.tar.gz diff --git a/sources b/sources index 3367216..41eebe0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -acee8e586bf125109f64c4911cfc82f6 tzcode2013i.tar.gz -778b4ca53a7cdf61d5147bef328f02b8 tzdata2013i.tar.gz +423a11bcffc10dda578058cf1587d048 tzdata2014a.tar.gz +77ccbb720f0f2076f12dff6ded70eb98 tzcode2014a.tar.gz diff --git a/tzdata.spec b/tzdata.spec index bcab843..a5117b8 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,16 @@ Summary: Timezone data Name: tzdata -Version: 2013i -%define tzdata_version 2013i -%define tzcode_version 2013i -Release: 2%{?dist} +Version: 2014a +%define tzdata_version 2014a +%define tzcode_version 2014a +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_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) BuildRequires: gawk, glibc, perl @@ -35,7 +36,8 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch1 -p1 +# Add new patches here... +# %patch1 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -57,7 +59,7 @@ popd %build FILES="africa antarctica asia australasia europe northamerica southamerica - pacificnew etcetera backward" + pacificnew etcetera backward" mkdir zoneinfo/{,posix,right} zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES @@ -96,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi %changelog +* Wed Mar 12 2014 Patsy Franklin 2014a-1 +- Rebase to 2014a + - Turkey begins DST on 2014-03-31, not 03-30. + * Tue Jan 21 2014 Patsy Franklin 2013i-2 - 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 - Changes for Brazil and Mauritius -* Wed May 30 2008 Petr Machata - 2008c-1 +* Fri May 30 2008 Petr Machata - 2008c-1 - Upstream 2008c - Mongolia changes zone - 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 - Venezuela is scheduled to change TZ to -4:30 on January 1 -* Thu Sep 25 2007 Keith Seitz - 2007g-2 +* Tue Sep 25 2007 Keith Seitz - 2007g-2 - Add support for building java's zoneinfo files in new tzdata-java RPM. @@ -757,7 +763,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Mar 16 2006 Petr Machata - 2006b-2 - Patch for Sri Lanka time zone change (#184514) -* Thu Feb 22 2006 Petr Machata 2006b-1 +* Wed Feb 22 2006 Petr Machata 2006b-1 - Upstream 2006b: - using tz64code version, as 32 is legacy according to tzdata ML - new manual pages for ctime, strftime, tzset