[java-1.8.0-openjdk/f20] Reverted tzdatausage
jiri vanek
jvanek at fedoraproject.org
Fri Jul 18 09:43:16 UTC 2014
commit c066ae42296089a74876bcd18a7e2130163ef239
Author: Jiri Vanek <jvanek at jvanek.redhat>
Date: Fri Jul 18 11:43:31 2014 +0200
Reverted tzdatausage
java-1.8.0-openjdk.spec | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 00affc2..fb25876 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -557,9 +557,9 @@ mv $JAVA_HOME/jre/bin/java $JAVA_HOME/jre/bin/java-abrt
cat %{SOURCE3} | sed -e s:@JAVA_PATH@:%{_jvmdir}/%{jredir}/bin/java-abrt:g -e s:@LIB_DIR@:%{LIBDIR}/libabrt-java-connector.so:g > $JAVA_HOME/jre/bin/java
chmod 755 $JAVA_HOME/jre/bin/java
-# Use system-wide tzdata
-rm $JAVA_HOME/jre/lib/tzdb.dat
-ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat
+
+# Copy tz.properties
+echo "sun.zoneinfo.dir=/usr/share/javazi" >> $JAVA_HOME/jre/lib/tz.properties
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
More information about the scm-commits
mailing list