Hello community,
here is the log from the commit of package java-1_8_0-openjdk for
openSUSE:Factory checked in at 2015-06-03 08:34:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_8_0-openjdk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes
2015-05-06 07:49:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes
2015-06-03 08:34:12.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 26 08:36:52 UTC 2015 - fst...@suse.com
+
+- Use the tzdb.dat from tzdata-java8 package on distributions
+ that have it.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_8_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.QHkGT2/_old 2015-06-03 08:34:14.000000000 +0200
+++ /var/tmp/diff_new_pack.QHkGT2/_new 2015-06-03 08:34:14.000000000 +0200
@@ -342,8 +342,6 @@
Group: Development/Languages
# Require jpackage-utils for ownership of /usr/lib/jvm/
Requires: jpackage-utils
-# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
-Requires: tzdata-java8
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives.
@@ -367,6 +365,10 @@
Provides: jndi-ldap = %{version}
Provides: jndi-rmi = %{version}
Provides: jsse = %{version}
+%if 0%{?suse_version} > 1320
+# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
+Requires(post): tzdata-java8
+%endif
%description headless
The OpenJDK runtime environment without audio and video support.
@@ -937,6 +939,12 @@
--slave %{_jvmjardir}/jre-%{javaver} \
jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
+%if 0%{?suse_version} > 1320
+if [ ! -e %{_jvmdir}/%{jredir}/lib/tzdb.dat ]; then
+ ln -sf %{_datadir}/javazi/tzdb.dat %{_jvmdir}/%{jredir}/lib/tzdb.dat
+fi
+%endif
+
%postun headless
if [ $1 -eq 0 ]
then
@@ -1150,6 +1158,9 @@
%if 0%{?suse_version} <= 1130
%config(noreplace) %{cacerts}
%endif
+%if 0%{?suse_version} > 1320
+%ghost %{_jvmdir}/%{jredir}/lib/tzdb.dat
+%endif
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs
