11
0

Accepting request 713603 from Java:Factory

bsc#1115375

OBS-URL: https://build.opensuse.org/request/show/713603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openjdk?expand=0&rev=64
This commit is contained in:
2019-07-08 13:00:48 +00:00
committed by Git OBS Bridge
2 changed files with 26 additions and 6 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 5 08:23:43 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Do not fail installation when the manpages are not present
(bsc#1115375)
-------------------------------------------------------------------
Thu May 2 14:41:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@@ -813,7 +813,8 @@ update-alternatives \
--slave %{_mandir}/man1/tnameserv.1$ext tnameserv.1$ext \
%{_mandir}/man1/tnameserv-%{sdklnk}.1$ext \
--slave %{_datadir}/applications/policytool.desktop policytool.desktop \
%{_jvmdir}/%{jredir}/lib/desktop/policytool.desktop
%{_jvmdir}/%{jredir}/lib/desktop/policytool.desktop \
|| :
update-alternatives \
--install %{_jvmdir}/jre-openjdk \
@@ -961,7 +962,8 @@ update-alternatives \
--slave %{_mandir}/man1/xjc.1$ext xjc.1$ext \
%{_mandir}/man1/xjc-%{sdklnk}.1$ext \
--slave %{_datadir}/applications/jconsole.desktop jconsole.desktop \
%{_jvmdir}/%{jredir}/lib/desktop/jconsole.desktop
%{_jvmdir}/%{jredir}/lib/desktop/jconsole.desktop \
|| :
update-alternatives \
--install %{_jvmdir}/java-openjdk \
@@ -983,14 +985,26 @@ then
fi
%post javadoc
update-alternatives \
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \
%{priority}
# in some settings, the %{_javadocdir}/%{sdklnk}/api does not exist
# and the update-alternatives call ends up in error. So, filter this
# cases out.
if [ -d %{_javadocdir}/%{sdklnk}/api ]
then
update-alternatives \
--install %{_javadocdir}/java javadocdir %{_javadocdir}/%{sdklnk}/api \
%{priority}
fi
%postun javadoc
if [ $1 -eq 0 ]
then
update-alternatives --remove javadocdir %{_javadocdir}/%{sdklnk}/api
# in some settings, the %{_javadocdir}/%{sdklnk}/api does not exist
# and the update-alternatives call ends up in error. So, filter this
# cases out.
if [ -d %{_javadocdir}/%{sdklnk}/api ]
then
update-alternatives --remove javadocdir %{_javadocdir}/%{sdklnk}/api
fi
fi
%post accessibility