Djam/java-1.8.0-openjdk
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/java-1.8.0-openjdk.git synced 2025-04-19 06:54:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix macro

Browse source
This commit is contained in:
Алексей-З 2020-05-13 17:49:24 +00:00
parent 1a22278ffe
commit 9726d0ae4b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java-1.8.0-openjdk.spec
View file

@ -145,7 +145,7 @@
%endif %endif
%bcond_with systap %bcond_with systap
%bcond_without timezone-java %bcond_without timezonejava
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
# disable in ROSA, to be packaged separately # disable in ROSA, to be packaged separately
@ -749,7 +749,7 @@ Provides: java-fonts%{?1} = %{epoch}:%{version}
Requires: rootcerts-java Requires: rootcerts-java
# Require jpackage-utils for ownership of /usr/lib/jvm/ # Require jpackage-utils for ownership of /usr/lib/jvm/
Requires: jpackage-utils Requires: jpackage-utils
%if %{with timezone-java} %if %{with timezonejava}
# Require zoneinfo data provided by tzdata-java subpackage. # Require zoneinfo data provided by tzdata-java subpackage.
Requires: timezone-java >= 2015d Requires: timezone-java >= 2015d
%endif %endif
@ -1054,7 +1054,7 @@ BuildRequires: java-1.8.0-openjdk-devel
%ifnarch %{jit_arches} %ifnarch %{jit_arches}
BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libffi)
%endif %endif
%if %{with timezone-java} %if %{with timezonejava}
BuildRequires: timezone-java >= 2015d BuildRequires: timezone-java >= 2015d
%endif %endif
BuildRequires: patch >= 2.7.5 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 nss.cfg right away as we will be using the JRE above
install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/ install -m 644 nss.cfg $JAVA_HOME/jre/lib/security/
%if %{with timezone-java} %if %{with timezonejava}
# Use system-wide tzdata # Use system-wide tzdata
#rm $JAVA_HOME/jre/lib/tzdb.dat #rm $JAVA_HOME/jre/lib/tzdb.dat
#ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat #ln -s %{_datadir}/javazi-1.8/tzdb.dat $JAVA_HOME/jre/lib/tzdb.dat