rpm/java-1_8_0-openjdk
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openjdk
Code Pull Requests Activity

Accepting request 309796 from Java:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/309796
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2015-06-03 06:34:11 +00:00 committed by Git OBS Bridge
commit cae11de284
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-1_8_0-openjdk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 26 08:36:52 UTC 2015 - fstrba@suse.com
- Use the tzdb.dat from tzdata-java8 package on distributions
that have it.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 5 15:15:09 UTC 2015 - fstrba@suse.com Tue May 5 15:15:09 UTC 2015 - fstrba@suse.com

15
java-1_8_0-openjdk.spec
View File

@ -342,8 +342,6 @@ Summary: OpenJDK Runtime Environment
Group: Development/Languages Group: Development/Languages
# Require jpackage-utils for ownership of /usr/lib/jvm/ # Require jpackage-utils for ownership of /usr/lib/jvm/
Requires: jpackage-utils Requires: jpackage-utils
# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
Requires: tzdata-java8
# Post requires update-alternatives to install tool update-alternatives. # Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives Requires(post): update-alternatives
# Postun requires update-alternatives to uninstall tool update-alternatives. # Postun requires update-alternatives to uninstall tool update-alternatives.
@ -367,6 +365,10 @@ Provides: jndi-dns = %{version}
Provides: jndi-ldap = %{version} Provides: jndi-ldap = %{version}
Provides: jndi-rmi = %{version} Provides: jndi-rmi = %{version}
Provides: jsse = %{version} Provides: jsse = %{version}
%if 0%{?suse_version} > 1320
# Require zoneinfo data in java8+ format provided by tzdata-java8 subpackage.
Requires(post): tzdata-java8
%endif
%description headless %description headless
The OpenJDK runtime environment without audio and video support. The OpenJDK runtime environment without audio and video support.
@ -937,6 +939,12 @@ update-alternatives \
--slave %{_jvmjardir}/jre-%{javaver} \ --slave %{_jvmjardir}/jre-%{javaver} \
jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk} 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
fi
%endif
%postun headless %postun headless
if [ $1 -eq 0 ] if [ $1 -eq 0 ]
then then
@ -1150,6 +1158,9 @@ fi
%if 0%{?suse_version} <= 1130 %if 0%{?suse_version} <= 1130
%config(noreplace) %{cacerts} %config(noreplace) %{cacerts}
%endif %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.policy
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklisted.certs