Use embedded tzdata for now

This commit is contained in:
Denis Silakov 2016-09-28 12:39:45 +03:00
parent 049ec9aa16
commit f71337bc07

View file

@ -756,7 +756,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
Name: java-%{javaver}-%{origin} Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever} Version: %{javaver}.%{updatever}
Release: 1.%{buildver}.2 Release: 1.%{buildver}.3
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons, # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages # and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a # also included the epoch in their virtual provides. This created a
@ -1403,8 +1403,8 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{j2sdkimage}
install -m 644 %{SOURCE11} $JAVA_HOME/jre/lib/security/ install -m 644 %{SOURCE11} $JAVA_HOME/jre/lib/security/
# Use system-wide tzdata # Use system-wide tzdata
rm $JAVA_HOME/jre/lib/tzdb.dat #rm $JAVA_HOME/jre/lib/tzdb.dat
ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat #ln -s %{_datadir}/javazi/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
#build cycles #build cycles
done done