CentOS Sources
2015-06-19 ad04f19d0e280a944cc807e85aec7240145053f1
import tzdata-2015e-1.el7
1 files added
3 files modified
101 ■■■■ changed files
.gitignore 5 ●●●●● patch | view | raw | blame | history
.tzdata.metadata 5 ●●●●● patch | view | raw | blame | history
SOURCES/8051641.patch 17 ●●●●● patch | view | raw | blame | history
SPECS/tzdata.spec 74 ●●●● patch | view | raw | blame | history
.gitignore
@@ -1,3 +1,4 @@
SOURCES/javazic-1.8-37392f2f5d59.tar.xz
SOURCES/javazic.tar.gz
SOURCES/tzcode2015d.tar.gz
SOURCES/tzdata2015d.tar.gz
SOURCES/tzcode2015e.tar.gz
SOURCES/tzdata2015e.tar.gz
.tzdata.metadata
@@ -1,3 +1,4 @@
77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
807cf10ef545314989175096aba605bee4062b61 SOURCES/tzcode2015d.tar.gz
a0ac599e3b8c87d70382b065878223860ac0f7d6 SOURCES/tzdata2015d.tar.gz
9502cd0d2508b74821287d3aa85a42f012e29a7a SOURCES/tzcode2015e.tar.gz
070179efcba7e6edaae1834c9ac1326d71373d65 SOURCES/tzdata2015e.tar.gz
SOURCES/8051641.patch
New file
@@ -0,0 +1,17 @@
diff -r c8a71253d6e2 -r 189490f29d1e make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
--- javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java    Thu Oct 23 11:42:20 2014 +0200
+++ javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java    Mon Dec 29 21:42:22 2014 +0300
@@ -491,10 +491,10 @@
                 TZRule rule = new TZRule(year, month, dayOfMonthIndicator, dayOfWeek, time, timeEndOfDay, timeDefinition, savingAmountSecs);
                 if (lastRule) {
                     lastRuleList.add(rule);
-                    maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
                 } else {
                     ruleList.add(rule);
                 }
+                maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
                 year++;
             }
         }
--
cgit v0.9.2
SPECS/tzdata.spec
@@ -1,8 +1,19 @@
%bcond_without java7
%if %{with java7}
%define bin_java %{_prefix}/lib/jvm/java-1.7.0/bin/java
%define bin_javac %{_prefix}/lib/jvm/java-1.7.0/bin/javac
%else
%define bin_java java
%define bin_javac javac
%endif
Summary: Timezone data
Name: tzdata
Version: 2015d
%define tzdata_version 2015d
%define tzcode_version 2015d
Version: 2015e
%define tzdata_version 2015e
%define tzcode_version 2015e
Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
@@ -13,8 +24,13 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gawk, glibc, perl
BuildRequires: java-devel
BuildRequires: glibc-common >= 2.5.90-7
%if %{with java7}
BuildRequires: java-1.7.0-openjdk-devel
%else
BuildRequires: java-devel
%endif
Conflicts: glibc-common <= 2.3.2-63
BuildArchitectures: noarch
@@ -26,19 +42,20 @@
Summary: Timezone data for Java
Group: System Environment/Base
Source3: javazic.tar.gz
Source4: http://omajid.fedorapeople.org/javazic-1.8-37392f2f5d59.tar.xz
Patch100: javazic-fixup.patch
Patch101: rebase-01.patch
Patch102: rebase-02.patch
Patch103: 7090844.patch
Patch104: 7133138.patch
Patch105: 8051641.patch
%description java
This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
# Add new java patches here
mkdir javazic
tar zxf %{SOURCE3} -C javazic
@@ -61,6 +78,11 @@
                         -e 's:sun\.util\.:rht.util.:g'
popd
tar xf %{SOURCE4}
%patch105
echo "%{name}%{tzdata_version}" >> VERSION
%build
FILES="africa antarctica asia australasia europe northamerica southamerica
    pacificnew etcetera backward"
@@ -72,13 +94,26 @@
grep -v tz-art.htm tz-link.htm > tz-link.html
# Java 6/7 tzdata
pushd javazic
javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
%{bin_javac} -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
popd
java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
%{bin_java} -classpath javazic/ rht.tools.javazic.Main -V %{version} \
  -d javazi \
  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
# Java 8 tzdata
%if %{with java7}
pushd javazic-1.8
%{bin_javac} -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
popd
%{bin_java} -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
    -srcdir . -dstfile tzdb.dat \
    -verbose \
    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
%endif
%install
rm -fr $RPM_BUILD_ROOT
@@ -86,6 +121,11 @@
cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
%if %{with java7}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -100,8 +140,26 @@
%files java
%defattr(-,root,root)
%{_datadir}/javazi
%if %{with java7}
%{_datadir}/javazi-1.8
%endif
%changelog
* Sun Jun 14 2015 Patsy Franklin <pfrankli@redhat.com> - 2015e-1
- Rebase to 2015e:
  - Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
    not 06-13 and 07-18 as we had guessed.  (Thanks to Milamber.)
  - Assume Cayman Islands will observe DST starting next year, using US rules.
    Although it isn't guaranteed, it is the most likely.
* Tue Jun  9 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-3
-  Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00,
   not 06-13 and 07-18 as we had guessed.
* Mon May  5 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-2
- Add support for generating OpenJDK 8+ timezone data
- Resolves: rhbz#1212540
* Sat Apr 25 2015 Patsy Franklin <pfrankli@redhat.com> - 2015d-1
- Rebase to 2015d:
  - The Egyptian Cabinet announced that DST will be cancelled for 2015.