Hello community,
here is the log from the commit of package java-10-openjdk for openSUSE:Factory
checked in at 2018-07-14 20:20:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-10-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-10-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-10-openjdk"
Sat Jul 14 20:20:11 2018 rev:20 rq:622423 version:10.0.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-10-openjdk/java-10-openjdk.changes
2018-07-09 09:30:47.191526261 +0200
+++ /work/SRC/openSUSE:Factory/.java-10-openjdk.new/java-10-openjdk.changes
2018-07-14 20:20:13.643415556 +0200
@@ -1,0 +2,11 @@
+Fri Jul 6 06:16:46 UTC 2018 - fst...@suse.com
+
+- Remove the alternative for java before reinstalling it, if idlj
+ is its slave (bsc#1096420)
+
+-------------------------------------------------------------------
+Wed Jun 27 08:41:42 UTC 2018 - fst...@suse.com
+
+- Move idlj to *-devel package (bsc#1096420)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-10-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.CyVrrQ/_old 2018-07-14 20:20:15.483420293 +0200
+++ /var/tmp/diff_new_pack.CyVrrQ/_new 2018-07-14 20:20:15.483420293 +0200
@@ -787,10 +787,15 @@
%post headless
ext=.gz
+# At a certain point, idlj and idlj was slave of java instead of
+# javac. This allows the upgrade pass without errors.
+if update-alternatives --query java | grep idlj >/dev/null 2>&1
+then
+ update-alternatives --remove java %{jrebindir}/java
+fi
update-alternatives \
--install %{_bindir}/java java %{jrebindir}/java %{priority} \
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
- --slave %{_bindir}/idlj idlj %{jrebindir}/idlj \
--slave %{_bindir}/jjs jjs %{jrebindir}/jjs \
--slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
--slave %{_bindir}/orbd orbd %{jrebindir}/orbd \
@@ -800,8 +805,6 @@
--slave %{_bindir}/tnameserv tnameserv %{jrebindir}/tnameserv \
--slave %{_mandir}/man1/java.1$ext java.1$ext \
%{_mandir}/man1/java-%{sdklnk}.1$ext \
- --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \
- %{_mandir}/man1/idlj-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \
%{_mandir}/man1/jjs-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \
@@ -871,6 +874,7 @@
--install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
--slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
+ --slave %{_bindir}/idlj idlj %{jrebindir}/idlj \
%if %{with aot}
--slave %{_bindir}/jaotc jaotc %{sdkbindir}/jaotc \
%endif
@@ -907,6 +911,8 @@
--slave %{_bindir}/xjc xjc %{sdkbindir}/xjc \
--slave %{_mandir}/man1/appletviewer.1$ext appletviewer.1$ext \
%{_mandir}/man1/appletviewer-%{sdklnk}.1$ext \
+ --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \
+ %{_mandir}/man1/idlj-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jar.1$ext jar.1$ext \
%{_mandir}/man1/jar-%{sdklnk}.1$ext \
--slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \
@@ -1021,7 +1027,6 @@
%{_jvmdir}/%{jrelnk}
%{_jvmprivdir}/*
-%{_jvmdir}/%{sdkdir}/bin/idlj
%{_jvmdir}/%{sdkdir}/bin/java
%{_jvmdir}/%{sdkdir}/bin/jjs
%{_jvmdir}/%{sdkdir}/bin/keytool
@@ -1095,7 +1100,6 @@
%config(noreplace) %{_jvmdir}/%{sdkdir}/lib/security/nss.cfg
%{_jvmdir}/%{sdkdir}/lib/security/default.policy
-%{_mandir}/man1/idlj-%{sdklnk}.1*
%{_mandir}/man1/java-%{sdklnk}.1*
%{_mandir}/man1/jjs-%{sdklnk}.1*
%{_mandir}/man1/keytool-%{sdklnk}.1*
@@ -1115,6 +1119,7 @@
%dir %{_jvmdir}/%{sdkdir}/tapset
%endif
%{_jvmdir}/%{sdkdir}/bin/appletviewer
+%{_jvmdir}/%{sdkdir}/bin/idlj
%if %{with aot}
%{_jvmdir}/%{sdkdir}/bin/jaotc
%endif
@@ -1171,6 +1176,7 @@
%endif
%{_jvmdir}/%{sdklnk}
%{_mandir}/man1/appletviewer-%{sdklnk}.1*
+%{_mandir}/man1/idlj-%{sdklnk}.1*
%{_mandir}/man1/jar-%{sdklnk}.1*
%{_mandir}/man1/jarsigner-%{sdklnk}.1*
%{_mandir}/man1/javac-%{sdklnk}.1*
++++++ missing-return.patch ++++++
--- /var/tmp/diff_new_pack.CyVrrQ/_old 2018-07-14 20:20:15.611420623 +0200
+++ /var/tmp/diff_new_pack.CyVrrQ/_new 2018-07-14 20:20:15.611420623 +0200
@@ -18,3 +18,13 @@
}
};
#endif // !_LP64
+--- jdk10/src/hotspot/cpu/zero/cppInterpreter_zero.cpp Sun Jun 24
16:25:47 2018 +0100
++++ jdk10/src/hotspot/cpu/zero/cppInterpreter_zero.cpp Sun Jun 24
20:53:26 2018 +0200
+@@ -102,6 +102,7 @@
+ return result;
+ default : ShouldNotReachHere();
+ }
++ return result;
+ }
+
+
