diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index cea95d5..24a4634 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -748,8 +748,10 @@ Provides: java-fonts%{?1} = %{epoch}:%{version} Requires: rootcerts-java # Require jpackage-utils for ownership of /usr/lib/jvm/ Requires: jpackage-utils +%if %{with timezone-java} # Require zoneinfo data provided by tzdata-java subpackage. Requires: timezone-java >= 2015d +%endif # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum eforce it, not rpm transaction and so no configs are persisted when pure rpm -u is run. I t may be consiedered as regression @@ -1051,7 +1053,9 @@ BuildRequires: java-1.8.0-openjdk-devel %ifnarch %{jit_arches} BuildRequires: pkgconfig(libffi) %endif +%if %{with timezone-java} BuildRequires: timezone-java >= 2015d +%endif BuildRequires: patch >= 2.7.5 # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1526,9 +1530,11 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{j2sdkimage} # Install nss.cfg right away as we will be using the JRE above install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/ +%if %{with timezone-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 +%endif #build cycles done