Removal of atk accessibility bridge bindings:
Removed libatk-wrapper[.]so.* from global _privatelibs Removed files_accessibility and java_accessibility_rpo macros Removed patch1 rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch and patch3 rh1648644-java_access_bridge_privileged_security.patch Removal of accessibility{,-slowdebug,-fastdebug} subpackages No longer creating symlinks of %%{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 to libatk-wrapper.so and %%{_libdir}/java-atk-wrapper/java-atk-wrapper.jar to java-atk-wrapper.jar No longer creating %%{_jvmdir}/%{jredir -- $suffix}/lib/accessibility.properties with content of "assistive_technologies=org.GNOME.Accessibility.AtkWrapper" Removal of accessibility{,-slowdebug,-fastdebug} subpackages files sections Fix upgrade path after removal of accessibility subpackage. As main accessibility was requiring main package, main package no have to obsolete java-1.8.0-openjdk-accessibility-{release, slowdebug, fastdebug} < 1:1.8.0.282.b08-5 otherwise update fails Resolves: rhbz#1971728
This commit is contained in:
parent
f4e1f24a15
commit
f9ea8b08a8
@ -311,7 +311,7 @@
|
|||||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||||
# eg jdk8u60-b27 -> b27
|
# eg jdk8u60-b27 -> b27
|
||||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||||
%global rpmrelease 4
|
%global rpmrelease 5
|
||||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||||
# Release will be (where N is usually a number starting at 1):
|
# Release will be (where N is usually a number starting at 1):
|
||||||
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||||
@ -354,7 +354,7 @@
|
|||||||
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
||||||
%global _privatelibs libatk-wrapper[.]so.*|libattach[.]so.*|libawt_headless[.]so.*|libawt[.]so.*|libawt_xawt[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libhprof[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava_crw_demo[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjli[.]so.*|libjsdt[.]so.*|libjsoundalsa[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libnpt[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsplashscreen[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.*
|
%global _privatelibs libattach[.]so.*|libawt_headless[.]so.*|libawt[.]so.*|libawt_xawt[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libhprof[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas_unix[.]so.*|libjava_crw_demo[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjli[.]so.*|libjsdt[.]so.*|libjsoundalsa[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libnpt[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsplashscreen[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*|lib[.]so\\(SUNWprivate_.*
|
||||||
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
|
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
|
||||||
%if %is_system_jdk
|
%if %is_system_jdk
|
||||||
%global __provides_exclude ^(%{_privatelibs})$
|
%global __provides_exclude ^(%{_privatelibs})$
|
||||||
@ -1056,12 +1056,6 @@ exit 0
|
|||||||
%endif
|
%endif
|
||||||
}
|
}
|
||||||
|
|
||||||
%define files_accessibility() %{expand:
|
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/lib/%{archinstall}/libatk-wrapper.so
|
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/lib/ext/java-atk-wrapper.jar
|
|
||||||
%{_jvmdir}/%{jredir -- %{?1}}/lib/accessibility.properties
|
|
||||||
}
|
|
||||||
|
|
||||||
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
||||||
%define java_rpo() %{expand:
|
%define java_rpo() %{expand:
|
||||||
Requires: fontconfig%{?_isa}
|
Requires: fontconfig%{?_isa}
|
||||||
@ -1192,24 +1186,13 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
|||||||
%endif
|
%endif
|
||||||
}
|
}
|
||||||
|
|
||||||
%define java_accessibility_rpo() %{expand:
|
|
||||||
Requires: java-atk-wrapper%{?_isa}
|
|
||||||
Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
|
||||||
OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release}
|
|
||||||
|
|
||||||
Provides: java-accessibility%{?1} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: java-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: java-%{javaver}-accessibility%{?1} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{release}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
# Prevent brp-java-repack-jars from being run
|
# Prevent brp-java-repack-jars from being run
|
||||||
%global __jar_repack 0
|
%global __jar_repack 0
|
||||||
|
|
||||||
Name: java-%{javaver}-%{origin}
|
Name: java-%{javaver}-%{origin}
|
||||||
Version: %{javaver}.%{updatever}.%{buildver}
|
Version: %{javaver}.%{updatever}.%{buildver}
|
||||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1
|
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||||
# also included the epoch in their virtual provides. This created a
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -1294,11 +1277,6 @@ Source16: CheckVendor.java
|
|||||||
# either in their current form or at all.
|
# either in their current form or at all.
|
||||||
############################################
|
############################################
|
||||||
|
|
||||||
# Accessibility patches
|
|
||||||
# Ignore AWTError when assistive technologies are loaded
|
|
||||||
Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
|
|
||||||
# Restrict access to java-atk-wrapper classes
|
|
||||||
Patch3: rh1648644-java_access_bridge_privileged_security.patch
|
|
||||||
# Turn on AssumeMP by default on RHEL systems
|
# Turn on AssumeMP by default on RHEL systems
|
||||||
Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
|
Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch
|
||||||
# RH1582504: Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY
|
# RH1582504: Use RSA as default for keytool, as DSA is disabled in all crypto policies except LEGACY
|
||||||
@ -1479,6 +1457,14 @@ BuildRequires: systemtap-sdt-devel
|
|||||||
# when it is built in debug-only this package is just placeholder
|
# when it is built in debug-only this package is just placeholder
|
||||||
%{java_rpo %{nil}}
|
%{java_rpo %{nil}}
|
||||||
|
|
||||||
|
# Fix upgrade path after removal of accessibility subpackage
|
||||||
|
# As main accessibility was requiring main package, main package now have to
|
||||||
|
# obsolete java-1.8.0-openjdk-accessibility-{release, slowdebug, fastdebug} < 1:1.8.0.282.b08-5
|
||||||
|
# otherwise update fails
|
||||||
|
Obsoletes: java-1.8.0-openjdk-accessibility < 1:1.8.0.282.b08-5
|
||||||
|
Obsoletes: java-1.8.0-openjdk-accessibility-slowdebug < 1:1.8.0.282.b08-5
|
||||||
|
Obsoletes: java-1.8.0-openjdk-accessibility-fastdebug < 1:1.8.0.282.b08-5
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The %{origin_nice} %{majorver} runtime environment.
|
The %{origin_nice} %{majorver} runtime environment.
|
||||||
|
|
||||||
@ -1663,44 +1649,6 @@ BuildArch: noarch
|
|||||||
The %{origin_nice} %{majorver} API documentation compressed in a single archive.
|
The %{origin_nice} %{majorver} API documentation compressed in a single archive.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{include_normal_build}
|
|
||||||
%package accessibility
|
|
||||||
Summary: %{origin_nice} %{majorver} accessibility connector
|
|
||||||
|
|
||||||
%{java_accessibility_rpo %{nil}}
|
|
||||||
|
|
||||||
%description accessibility
|
|
||||||
Enables accessibility support in %{origin_nice} %{majorver} 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 %{origin_nice} %{majorver} 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.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{include_debug_build}
|
|
||||||
%package accessibility-slowdebug
|
|
||||||
Summary: %{origin_nice} %{majorver} accessibility connector %{for_debug}
|
|
||||||
|
|
||||||
%{java_accessibility_rpo -- %{debug_suffix_unquoted}}
|
|
||||||
|
|
||||||
%description accessibility-slowdebug
|
|
||||||
See normal java-%{version}-openjdk-accessibility description.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{include_fastdebug_build}
|
|
||||||
%package accessibility-fastdebug
|
|
||||||
Summary: %{origin_nice} %{majorver} accessibility connector %{for_fastdebug}
|
|
||||||
|
|
||||||
%{java_accessibility_rpo -- %{fastdebug_suffix_unquoted}}
|
|
||||||
|
|
||||||
%description accessibility-fastdebug
|
|
||||||
See normal java-%{version}-openjdk-accessibility description.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with_openjfx_binding}
|
%if %{with_openjfx_binding}
|
||||||
%package openjfx
|
%package openjfx
|
||||||
Summary: OpenJDK x OpenJFX connector. This package adds symliks finishing Java FX integration to %{name}
|
Summary: OpenJDK x OpenJFX connector. This package adds symliks finishing Java FX integration to %{name}
|
||||||
@ -1824,8 +1772,6 @@ sh %{SOURCE12}
|
|||||||
%patch400
|
%patch400
|
||||||
%patch401
|
%patch401
|
||||||
|
|
||||||
%patch1
|
|
||||||
%patch3
|
|
||||||
%patch5
|
%patch5
|
||||||
|
|
||||||
# s390 build fixes
|
# s390 build fixes
|
||||||
@ -2309,21 +2255,6 @@ find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir -- $suffix}/demo \
|
|||||||
| sed 's|^|%dir |' \
|
| sed 's|^|%dir |' \
|
||||||
>> %{name}-demo.files"$suffix"
|
>> %{name}-demo.files"$suffix"
|
||||||
|
|
||||||
# Create links which leads to separately installed java-atk-bridge and allow configuration
|
|
||||||
# links points to java-atk-wrapper - an dependence
|
|
||||||
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/%{archinstall}
|
|
||||||
ln -s %{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 libatk-wrapper.so
|
|
||||||
popd
|
|
||||||
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/ext
|
|
||||||
ln -s %{_libdir}/java-atk-wrapper/java-atk-wrapper.jar java-atk-wrapper.jar
|
|
||||||
popd
|
|
||||||
pushd $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir -- $suffix}/lib/
|
|
||||||
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
|
|
||||||
|
|
||||||
# intentionally after all else, fx links with redirections on its own
|
# intentionally after all else, fx links with redirections on its own
|
||||||
%if %{with_openjfx_binding}
|
%if %{with_openjfx_binding}
|
||||||
FXSDK_FILES=%{name}-openjfx-devel.files"$suffix"
|
FXSDK_FILES=%{name}-openjfx-devel.files"$suffix"
|
||||||
@ -2526,7 +2457,6 @@ require "copy_jdk_configs.lua"
|
|||||||
# placeholder
|
# placeholder
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%if %{include_normal_build}
|
%if %{include_normal_build}
|
||||||
%files headless
|
%files headless
|
||||||
# important note, see https://bugzilla.redhat.com/show_bug.cgi?id=1038092 for whole issue
|
# important note, see https://bugzilla.redhat.com/show_bug.cgi?id=1038092 for whole issue
|
||||||
@ -2550,9 +2480,6 @@ require "copy_jdk_configs.lua"
|
|||||||
%files javadoc-zip
|
%files javadoc-zip
|
||||||
%{files_javadoc_zip %{nil}}
|
%{files_javadoc_zip %{nil}}
|
||||||
|
|
||||||
%files accessibility
|
|
||||||
%{files_accessibility %{nil}}
|
|
||||||
|
|
||||||
%if %{with_openjfx_binding}
|
%if %{with_openjfx_binding}
|
||||||
%files openjfx -f %{name}-openjfx.files
|
%files openjfx -f %{name}-openjfx.files
|
||||||
|
|
||||||
@ -2576,9 +2503,6 @@ require "copy_jdk_configs.lua"
|
|||||||
%files src-slowdebug
|
%files src-slowdebug
|
||||||
%{files_src -- %{debug_suffix_unquoted}}
|
%{files_src -- %{debug_suffix_unquoted}}
|
||||||
|
|
||||||
%files accessibility-slowdebug
|
|
||||||
%{files_accessibility -- %{debug_suffix_unquoted}}
|
|
||||||
|
|
||||||
%if %{with_openjfx_binding}
|
%if %{with_openjfx_binding}
|
||||||
%files openjfx-slowdebug -f %{name}-openjfx.files-slowdebug
|
%files openjfx-slowdebug -f %{name}-openjfx.files-slowdebug
|
||||||
|
|
||||||
@ -2596,16 +2520,12 @@ require "copy_jdk_configs.lua"
|
|||||||
%files devel-fastdebug
|
%files devel-fastdebug
|
||||||
%{files_devel -- %{fastdebug_suffix_unquoted}}
|
%{files_devel -- %{fastdebug_suffix_unquoted}}
|
||||||
|
|
||||||
|
|
||||||
%files demo-fastdebug -f %{name}-demo.files-fastdebug
|
%files demo-fastdebug -f %{name}-demo.files-fastdebug
|
||||||
%{files_demo -- %{fastdebug_suffix_unquoted}}
|
%{files_demo -- %{fastdebug_suffix_unquoted}}
|
||||||
|
|
||||||
%files src-fastdebug
|
%files src-fastdebug
|
||||||
%{files_src -- %{fastdebug_suffix_unquoted}}
|
%{files_src -- %{fastdebug_suffix_unquoted}}
|
||||||
|
|
||||||
%files accessibility-fastdebug
|
|
||||||
%{files_accessibility -- %{fastdebug_suffix_unquoted}}
|
|
||||||
|
|
||||||
%if %{with_openjfx_binding}
|
%if %{with_openjfx_binding}
|
||||||
%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug
|
%files openjfx-fastdebug -f %{name}-openjfx.files-fastdebug
|
||||||
|
|
||||||
@ -2614,6 +2534,27 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jun 16 2021 Sérgio Basto <sergio@serjux.com> - 1:1.8.0.282.b08-5
|
||||||
|
- Fix upgrade path after removal of accessibility subpackage. As main
|
||||||
|
accessibility was requiring main package, main package now have to
|
||||||
|
obsolete java-1.8.0-openjdk-accessibility-{release, slowdebug, fastdebug} < 1:1.8.0.282.b08-5
|
||||||
|
otherwise update fails
|
||||||
|
- Resolves: rhbz#1971728
|
||||||
|
|
||||||
|
* Wed Jun 16 2021 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.282.b08-5
|
||||||
|
- Removal of atk accessibility bridge bindings:
|
||||||
|
- Removed libatk-wrapper[.]so.* from global _privatelibs
|
||||||
|
- Removed files_accessibility and java_accessibility_rpo macros
|
||||||
|
- Removed patch1 rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch and
|
||||||
|
patch3 rh1648644-java_access_bridge_privileged_security.patch
|
||||||
|
- Removal of accessibility{,-slowdebug,-fastdebug} subpackages
|
||||||
|
- No longer creating symlinks of %%{_libdir}/java-atk-wrapper/libatk-wrapper.so.0 to libatk-wrapper.so
|
||||||
|
and %%{_libdir}/java-atk-wrapper/java-atk-wrapper.jar to java-atk-wrapper.jar
|
||||||
|
- No longer creating %%{_jvmdir}/%{jredir -- $suffix}/lib/accessibility.properties with
|
||||||
|
content of "assistive_technologies=org.GNOME.Accessibility.AtkWrapper"
|
||||||
|
- Removal of accessibility{,-slowdebug,-fastdebug} subpackages files sections
|
||||||
|
- Resolves: rhbz#1971728
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.8.0.282.b08-4.1
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:1.8.0.282.b08-4.1
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
|
|
||||||
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
|
|
||||||
+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
|
|
||||||
@@ -883,7 +883,11 @@
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
- loadAssistiveTechnologies();
|
|
||||||
+ try {
|
|
||||||
+ loadAssistiveTechnologies();
|
|
||||||
+ } catch ( AWTError error) {
|
|
||||||
+ // ignore silently
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
return toolkit;
|
|
||||||
}
|
|
@ -1,25 +0,0 @@
|
|||||||
diff --git openjdk.orig/jdk/src/share/lib/security/java.security-linux openjdk/jdk/src/share/lib/security/java.security-linux
|
|
||||||
--- openjdk.orig/jdk/src/share/lib/security/java.security-linux
|
|
||||||
+++ openjdk/jdk/src/share/lib/security/java.security-linux
|
|
||||||
@@ -226,7 +226,9 @@
|
|
||||||
com.sun.activation.registries.,\
|
|
||||||
jdk.jfr.events.,\
|
|
||||||
jdk.jfr.internal.,\
|
|
||||||
- jdk.management.jfr.internal.
|
|
||||||
+ jdk.management.jfr.internal.,\
|
|
||||||
+ org.GNOME.Accessibility.,\
|
|
||||||
+ org.GNOME.Bonobo.
|
|
||||||
|
|
||||||
#
|
|
||||||
# List of comma-separated packages that start with or equal this string
|
|
||||||
@@ -279,7 +281,9 @@
|
|
||||||
com.sun.activation.registries.,\
|
|
||||||
jdk.jfr.events.,\
|
|
||||||
jdk.jfr.internal.,\
|
|
||||||
- jdk.management.jfr.internal.
|
|
||||||
+ jdk.management.jfr.internal.,\
|
|
||||||
+ org.GNOME.Accessibility.,\
|
|
||||||
+ org.GNOME.Bonobo.
|
|
||||||
|
|
||||||
#
|
|
||||||
# Determines whether this properties file can be appended to
|
|
Loading…
Reference in New Issue
Block a user