Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package java-11-openj9 for openSUSE:Factory
checked in at 2023-02-25 19:55:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-11-openj9 (Old)
and /work/SRC/openSUSE:Factory/.java-11-openj9.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-11-openj9"
Sat Feb 25 19:55:05 2023 rev:14 rq:1067655 version:11.0.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/java-11-openj9/java-11-openj9.changes
2022-11-01 13:42:05.111741905 +0100
+++ /work/SRC/openSUSE:Factory/.java-11-openj9.new.31432/java-11-openj9.changes
2023-02-25 19:55:19.955348257 +0100
@@ -1,0 +2,12 @@
+Fri Feb 17 13:19:03 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Remove the accessibility sub-package, since it was never really
+ working and creates another problems (bsc#1205916). It can
+ eventually be built as standalone if needed
+- Removed patches:
+ * jaw-jdk10.patch
+ * jaw-misc.patch
+ * jaw-nogtk.patch
+ + not needed after the removal of the accessibility sub-package
+
+-------------------------------------------------------------------
Old:
----
java-atk-wrapper-0.33.2.tar.xz
jaw-jdk10.patch
jaw-misc.patch
jaw-nogtk.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-11-openj9.spec ++++++
--- /var/tmp/diff_new_pack.8uaPrC/_old 2023-02-25 19:55:21.415357255 +0100
+++ /var/tmp/diff_new_pack.8uaPrC/_new 2023-02-25 19:55:21.419357279 +0100
@@ -1,7 +1,7 @@
#
# spec file
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -47,7 +47,6 @@
%global openj9_branch v0.35.0-release
%global openj9_tag openj9-0.35.0
# JavaEE modules
-%global java_atk_wrapper_version 0.33.2
%global java_activation_repository activation
%global java_activation_tag JAF-1_2_0
%global java_xml_bind_repository jaxb-spec
@@ -110,8 +109,6 @@
Source0: %{root_repository}/%{root_revision}.zip
Source1: %{omr_repository}/%{omr_revision}.zip
Source2: %{openj9_repository}/%{openj9_revision}.zip
-# Accessibility support
-Source8:
https://download.gnome.org/sources/java-atk-wrapper/0.33/java-atk-wrapper-%{java_atk_wrapper_version}.tar.xz
# Desktop files. Adapted from IcedTea.
Source11: jconsole.desktop.in
# nss configuration file
@@ -163,10 +160,6 @@
Patch302: disable-doclint-by-default.patch
Patch303: alternative-tzdb_dat.patch
#
-Patch400: jaw-misc.patch
-Patch401: jaw-jdk10.patch
-Patch402: jaw-nogtk.patch
-#
Patch500: activation-module.patch
Patch501: annotation-module.patch
BuildRequires: alsa-lib-devel
@@ -206,13 +199,6 @@
BuildRequires: xorg-x11-proto-devel
BuildRequires: xprop
BuildRequires: zip
-BuildRequires: pkgconfig(atk) >= 2.14.0
-BuildRequires: pkgconfig(atk-bridge-2.0)
-BuildRequires: pkgconfig(atspi-2) >= 2.14.0
-BuildRequires: pkgconfig(dbus-1)
-BuildRequires: pkgconfig(glib-2.0) >= 2.32.0
-BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(gthread-2.0)
# Requires rest of java
Requires: %{name}-headless = %{version}-%{release}
Requires: fontconfig
@@ -293,6 +279,7 @@
# Postun requires update-alternatives to uninstall tool update-alternatives.
Requires(postun):update-alternatives
Recommends: tzdata-java8
+Obsoletes: %{name}-accessibility
# Standard JPackage base provides.
Provides: java-%{javaver}-headless = %{version}-%{release}
Provides: java-headless = %{javaver}
@@ -387,25 +374,8 @@
%description javadoc
The OpenJDK %{featurever} API documentation.
-%package accessibility
-Summary: OpenJDK %{featurever} accessibility connector
-Group: Development/Languages/Java
-Requires: %{name} = %{version}-%{release}
-Requires: xprop
-
-%description accessibility
-Enables accessibility support in OpenJDK %{featurever} by using
java-atk-wrapper. This allows
-compatible at-spi2 based accessibility programs to work for AWT and Swing-based
-programs.
-
-Please note, the java-atk-wrapper is still in beta, and OpenJDK itself is still
-being tuned to be working with accessibility features. There are known issues
-with accessibility on, so please do not install this package unless you really
-need to.
-
%prep
%setup -q -n openj9-openjdk-jdk11-%{root_revision} -a 1 -a 2
-%setup -q -D -n openj9-openjdk-jdk11-%{root_revision} -T -a 8
%setup -q -D -n openj9-openjdk-jdk11-%{root_revision} -T -a 20
%setup -q -D -n openj9-openjdk-jdk11-%{root_revision} -T -a 21
%setup -q -D -n openj9-openjdk-jdk11-%{root_revision} -T -a 22
@@ -449,10 +419,6 @@
%patch302 -p1
%patch303 -p1
-%patch400
-%patch401
-%patch402
-
%patch500
%patch501
@@ -527,24 +493,6 @@
# Copy tz.properties
echo "sun.zoneinfo.dir=%{_datadir}/javazi" >> $JAVA_HOME/conf/tz.properties
-# Build the accessibility plugin
-pushd java-atk-wrapper-%{java_atk_wrapper_version}
-autoreconf --force --install
-rm wrapper/org/GNOME/Accessibility/AtkWrapper.java
-%configure \
- --without-jdk-auto-detect \
- JDK_SRC=$JAVA_HOME
-rm wrapper/org/GNOME/Accessibility/AtkWrapper.java
-make %{?_smp_mflags}
-cp wrapper/java-atk-wrapper.jar $JAVA_HOME/../jmods/
-cp jni/src/.libs/libatk-wrapper.so $JAVA_HOME/lib/
-popd
-# Merge the java-atk-wrapper into the JDK
-source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"atk.wrapper,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
-cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
-rm -rf $JAVA_HOME/../newjdk
-
%if %{add_back_javaee_modules}
# Merge back some Java EE modules removed in OpenJDK 11 by JEP 320
@@ -559,7 +507,7 @@
popd
# Merge the java activation framework into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.activation,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.activation,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -573,7 +521,7 @@
popd
# Merge java.xml.bind into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.bind,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.bind,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -587,7 +535,7 @@
popd
# Merge java.xml.soap into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.soap,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.soap,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -601,7 +549,7 @@
popd
# Merge java.annotation into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.annotation,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.annotation,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -615,7 +563,7 @@
popd
# Merge java.xml.ws into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.ws,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"java.xml.ws,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -629,7 +577,7 @@
popd
# Merge com.sun.xml.fastinfoset into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.fastinfoset,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.fastinfoset,${MODULES//\ /,}" --release-info $JAVA_HOME/release
--output $JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -643,7 +591,7 @@
popd
# Merge org.jvnet.staxex into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"org.jvnet.staxex,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"org.jvnet.staxex,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -657,7 +605,7 @@
popd
# Merge com.sun.istack into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.istack.runtime,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.istack.runtime,${MODULES//\ /,}" --release-info $JAVA_HOME/release
--output $JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -671,7 +619,7 @@
popd
# Merge org.jvnet.staxex into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.txw2,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.txw2,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -685,7 +633,7 @@
popd
# Merge org.jvnet.staxex into the JDK
source $JAVA_HOME/release; export MODULES
-$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.bind,${MODULES//\ /,}" --output $JAVA_HOME/../newjdk
+$JAVA_HOME/bin/jlink --module-path $JAVA_HOME/../jmods --add-modules
"com.sun.xml.bind,${MODULES//\ /,}" --release-info $JAVA_HOME/release --output
$JAVA_HOME/../newjdk
cp -rf $JAVA_HOME/../newjdk/* $JAVA_HOME/
rm -rf $JAVA_HOME/../newjdk
@@ -805,14 +753,6 @@
| sed 's|^|%doc |' \
>> %{name}-demo.files
-# Create a config file to enable java-atk-wrapper
-pushd %{buildroot}/%{_jvmdir}/%{sdkdir}/conf/
- echo "#Config file to enable java-atk-wrapper" > accessibility.properties
- echo "" >> accessibility.properties
- echo "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" >>
accessibility.properties
- echo "" >> accessibility.properties
-popd
-
# fdupes links the files from JDK to JRE, so it breaks a JRE
# use it carefully :))
%fdupes -s %{buildroot}/%{_jvmdir}/%{sdkdir}/
@@ -1011,6 +951,7 @@
%{_jvmdir}/%{jrelnk}
%{_jvmprivdir}/*
+%{_jvmdir}/%{sdkdir}/release
%{_jvmdir}/%{sdkdir}/bin/java
%ifnarch aarch64
%{_jvmdir}/%{sdkdir}/bin/jitserver
@@ -1186,9 +1127,7 @@
%files jmods
%dir %{_jvmdir}/%{sdkdir}/jmods
-%{_jvmdir}/%{sdkdir}/release
%{_jvmdir}/%{sdkdir}/jmods/*.jmod
-%{_jvmdir}/%{sdkdir}/jmods/java-atk-wrapper.jar
%files demo -f %{name}-demo.files
@@ -1200,8 +1139,4 @@
%dir %{_javadocdir}/%{sdklnk}
%{_javadocdir}/%{sdklnk}/*
-%files accessibility
-%config(noreplace) %{_jvmdir}/%{sdkdir}/conf/accessibility.properties
-%{_jvmdir}/%{sdkdir}/lib/libatk-wrapper.so
-
%changelog
