Accepting request 407213 from Java:Factory

Fix script linking tzdb.data (bsc#987895) and enable SunEC for SLE12/Leap42 (bsc#982366)

OBS-URL: https://build.opensuse.org/request/show/407213
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2016-07-14 07:42:28 +00:00 committed by Git OBS Bridge
commit 7c667ed3f9
2 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jul 7 14:41:06 UTC 2016 - fstrba@suse.com
- Fix script linking /usr/share/javazi/tzdb.dat for platform where
it applies (bsc#987895)
- Enable SunEC for SLE12 and Leap
-------------------------------------------------------------------
Tue Jun 14 11:46:16 UTC 2016 - agraf@suse.com

View File

@ -118,8 +118,12 @@
%if 0%{?__isa_bits}
%global bits %{__isa_bits}
%endif
%if 0%{?suse_version} >= 1330
%if 0%{?suse_version} >= 1330 || 0%{?suse_version} == 1315
%if %{with bootstrap}
%global with_sunec 0
%else
%global with_sunec 1
%endif
%else
%global with_sunec 0
%endif
@ -811,8 +815,11 @@ update-alternatives \
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
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