Hello community,
here is the log from the commit of package java-11-openjdk for openSUSE:Factory
checked in at 2020-02-20 14:53:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-11-openjdk.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openjdk"
Thu Feb 20 14:53:24 2020 rev:36 rq:774720 version:11.0.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openjdk/java-11-openjdk.changes
2020-01-18 12:16:52.111098282 +0100
+++
/work/SRC/openSUSE:Factory/.java-11-openjdk.new.26092/java-11-openjdk.changes
2020-02-20 14:53:28.358062265 +0100
@@ -1,0 +2,12 @@
+Thu Feb 13 15:46:21 UTC 2020 - Andreas Schwab <sch...@suse.de>
+
+- DependOnVariableHelper.patch: Fix DependOnVariableHelper for make 4.3
+
+-------------------------------------------------------------------
+Sun Feb 2 22:35:55 UTC 2020 - Fridrich Strba <fst...@suse.com>
+
+- Install java icons not only versioned, but also postfixed by the
+ "openjdk", in order to prevent install conflicts with other
+ jdk 11 flavours.
+
+-------------------------------------------------------------------
New:
----
DependOnVariableHelper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.2M7vVZ/_old 2020-02-20 14:53:30.830067242 +0100
+++ /var/tmp/diff_new_pack.2M7vVZ/_new 2020-02-20 14:53:30.830067242 +0100
@@ -209,6 +209,7 @@
Patch20: loadAssistiveTechnologies.patch
#
Patch30: JDK-8208602.patch
+Patch31: DependOnVariableHelper.patch
#
# OpenJDK specific patches
#
@@ -369,8 +370,8 @@
%package devel
Summary: OpenJDK %{featurever} Development Environment
-# Require base package.
Group: Development/Languages/Java
+# Require base package.
Requires: %{name} = %{version}-%{release}
# Post requires update-alternatives to install tool update-alternatives.
Requires(post): update-alternatives
@@ -504,6 +505,7 @@
%patch20 -p1
%patch30 -p1
+%patch31 -p1
# s390 build fixes
@@ -938,7 +940,7 @@
for s in 16 24 32 48 ; do
install -D -p -m 644 \
src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png \
- %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
+
%{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}-openjdk.png
done
# Install desktop file.
@@ -1183,7 +1185,7 @@
%{_jvmdir}/%{sdkdir}/lib/libjawt.so
%{_jvmdir}/%{sdkdir}/lib/libsplashscreen.so
%dir %{_datadir}/icons/hicolor
-%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png
+%{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}-openjdk.png
%files headless
%dir %{_jvmdir}
++++++ DependOnVariableHelper.patch ++++++
# HG changeset patch
# User ihse
# Date 1580378910 -3600
# Thu Jan 30 11:08:30 2020 +0100
# Node ID 0743e1d49930a95d045bfdaa8f8607a00289e677
# Parent 24b4c763cb2276db073bec263246879eb312daeb
8237879: make 4.3 breaks build
Reviewed-by: erikj, tbell
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -525,15 +525,16 @@
# Param 2 - (optional) name of file to store value in
DependOnVariableHelper = \
$(strip \
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
+ $(call MakeDir, $(dir $($1_filename))) \
$(if $(findstring $(LOG_LEVEL), trace), \
$(info NewVariable $1: >$(strip $($1))<) \
$(info OldVariable $1: >$(strip $($1_old))<)) \
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call
EscapeHash,$($1))), \
- $(call DependOnVariableFileName, $1, $2))) \
- $(call DependOnVariableFileName, $1, $2) \
+ $($1_filename))) \
+ $($1_filename) \
)
# Main macro
