commit java-1_8_0-openjdk for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2019-07-08 15:00:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Mon Jul 8 15:00:48 2019 rev:64 rq:713603 version:1.8.0.212 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2019-05-03 22:27:39.412359525 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new.4615/java-1_8_0-openjdk.changes 2019-07-08 15:00:49.810516883 +0200 @@ -1,0 +2,6 @@ +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) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.Ffiwpw/_old 2019-07-08 15:00:52.286520626 +0200 +++ /var/tmp/diff_new_pack.Ffiwpw/_new 2019-07-08 15:00:52.290520633 +0200 @@ -813,7 +813,8 @@ --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 @@ --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 @@ fi %post javadoc -update-alternatives \ +# 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 +# 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
participants (1)
-
root