Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2017-10-06 10:55:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Fri Oct 6 10:55:44 2017 rev:91 rq:531543 version:1.7.0.151
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk.changes
2017-09-27 16:49:30.648388089 +0200
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk.changes
2017-10-06 10:55:53.325939680 +0200
@@ -1,0 +2,12 @@
+Thu Oct 5 08:04:23 UTC 2017 - [email protected]
+
+- Rename the icons from java.png to java-1.7.0.png to correspond
+ to what the *.desktop files expect
+
+-------------------------------------------------------------------
+Mon Oct 2 07:46:13 UTC 2017 - [email protected]
+
+- Change the requirement of tzdata-java to Recommends, since it is
+ not strictly needed.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.Tf4vUg/_old 2017-10-06 10:55:55.565601143 +0200
+++ /var/tmp/diff_new_pack.Tf4vUg/_new 2017-10-06 10:55:55.565601143 +0200
@@ -370,10 +370,9 @@
%package headless
Summary: OpenJDK 7 runtime environment without X, audio and video
support
-# Require zoneinfo data provided by tzdata-java subpackage.
Group: Development/Languages/Java
-Requires: tzdata-java
Requires(pre): update-alternatives
+Recommends: tzdata-java
Provides: java-headless = %{version}-%{release}
Provides: java-openjdk-headless = %{version}-%{release}
Provides: jre-%{javaver}-headless = %{version}-%{release}
@@ -453,6 +452,9 @@
Provides: java-%{javaver}-javadoc = %{version}-%{release}
Provides: java-%{javaver}-openjdk-javadoc = %{version}-%{release}
Provides: java-javadoc = %{version}-%{release}
+%if 0%{?suse_version} >= 1120
+BuildArch: noarch
+%endif
%description javadoc
This package provides documentation of the API provided by OpenJDK 7
@@ -793,7 +795,7 @@
for s in 16 24 32 48 ; do
install -D -p -m 644 \
openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java.png
+ %{buildroot}%{_datadir}/icons/hicolor/${s}x${s}/apps/java-%{javaver}.png
done
# Install desktop files.
@@ -1077,7 +1079,7 @@
%dir %{_jvmdir}/%{sdkdir}/jre/lib/desktop/
%{_jvmdir}/%{sdkdir}/jre/lib/desktop/policytool.desktop
-%{_datadir}/icons/hicolor/*/apps/java.png
+%{_datadir}/icons/hicolor/*/apps/java-%{javaver}.png
%{_jvmdir}/java-%{javaver}-openjdk
%dir %{_jvmdir}/%{sdkdir}