From 9726d0ae4b6e09819acf43f07721c41dd84c4f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9-=D0=97?= Date: Wed, 13 May 2020 17:49:24 +0000 Subject: [PATCH] Fix macro --- java-1.8.0-openjdk.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index b54a26d..56b7706 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -145,7 +145,7 @@ %endif %bcond_with systap -%bcond_without timezone-java +%bcond_without timezonejava %ifarch %{ix86} x86_64 # disable in ROSA, to be packaged separately @@ -749,7 +749,7 @@ 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} +%if %{with timezonejava} # Require zoneinfo data provided by tzdata-java subpackage. Requires: timezone-java >= 2015d %endif @@ -1054,7 +1054,7 @@ BuildRequires: java-1.8.0-openjdk-devel %ifnarch %{jit_arches} BuildRequires: pkgconfig(libffi) %endif -%if %{with timezone-java} +%if %{with timezonejava} BuildRequires: timezone-java >= 2015d %endif BuildRequires: patch >= 2.7.5 @@ -1531,7 +1531,7 @@ 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} +%if %{with timezonejava} # 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