OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openjdk?expand=0&rev=255

java-1_8_0-openjdk.spec

@@ -199,6 +199,7 @@ Patch1001:      java-1_8_0-openjdk-suse-desktop-files.patch
 Patch2000:      java-1_8_0-openjdk-gcc6.patch
 Patch2001:      disable-doclint-by-default.patch
 Patch2002:      java-1_8_0-openjdk-linuxfilestore.patch
+Patch2003:      alternative-tzdb_dat.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -346,7 +347,7 @@ Requires:       mozilla-nss
 %endif
 %if 0%{?suse_version} > 1320
 # Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
-Requires(post): tzdata-java8
+Requires:       tzdata-java8
 %endif
 
 %description headless
@@ -570,6 +571,7 @@ patch -p0 -i %{PATCH2000}
 patch -p0 -i %{PATCH2001}
 
 patch -p0 -i %{PATCH2002}
+patch -p0 -i %{PATCH2003}
 
 (cd openjdk/common/autoconf
  bash ./autogen.sh
@@ -615,6 +617,9 @@ echo "" >> $JAVA_HOME/jre/lib/pulseaudio.properties
 popd
 %endif
 
+# Copy tz.properties
+echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/jre/lib/tz.properties
+
 # Check debug symbols are present and can identify code
 SERVER_JVM="$JAVA_HOME/jre/lib/%{archinstall}/server/libjvm.so"
 if [ -f "$SERVER_JVM" ] ; then
@@ -868,15 +873,6 @@ update-alternatives \
   --slave %{_jvmjardir}/jre-%{javaver} \
   jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
 
-%if 0%{?suse_version} > 1320
-if [ -e %{_datadir}/javazi/tzdb.dat ]; then
-	if [ -e %{_jvmdir}/%{jredir}/lib/tzdb.dat ]; then
-		rm -f %{_jvmdir}/%{jredir}/lib/tzdb.dat
-	fi
-	ln -sf %{_datadir}/javazi/tzdb.dat  %{_jvmdir}/%{jredir}/lib/tzdb.dat
-fi
-%endif
-
 %postun headless
 if [ $1 -eq 0 ]
 then
@@ -1106,9 +1102,6 @@ fi
 %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