update to 11.0.10_9
java-opendk11: give higher priority alternatives to binaries than jre [release 11.0.10_9-1mamba;Mon Jan 25 2021]
This commit is contained in:
parent
ec9f49f8f2
commit
d97f87b4d4
@ -2,6 +2,7 @@
|
||||
%define updver %(echo %version | cut -d_ -f2)
|
||||
%define srcver %(echo %version | tr _ +)
|
||||
%define altver %(expr 60 + %javaver)
|
||||
%define altverjdk %(expr 61 + %javaver)
|
||||
|
||||
# bootstrap with external binary java environment
|
||||
%define bootstrap 0
|
||||
@ -56,7 +57,7 @@
|
||||
%define _jvmdir /usr/lib/jvm
|
||||
|
||||
Name: java-openjdk11
|
||||
Version: 11.0.10_7
|
||||
Version: 11.0.10_9
|
||||
Release: 1mamba
|
||||
Summary: OpenJDK Java %{javaver} environment
|
||||
Group: System/Libraries/Java
|
||||
@ -253,8 +254,7 @@ bash configure \
|
||||
--with-zlib=system \
|
||||
--with-jvm-features=zgc \
|
||||
--enable-unlimited-crypto \
|
||||
--disable-warnings-as-errors \
|
||||
$RPM_BUILD_NCPUS
|
||||
--disable-warnings-as-errors
|
||||
|
||||
make images legacy-jre-image docs
|
||||
|
||||
@ -347,68 +347,46 @@ if [ $1 -ge 1 ]; then
|
||||
if ! echo ${PATH} | grep -q %{sdkbindir}; then
|
||||
export PATH="$PATH:%{sdkbindir}"
|
||||
fi
|
||||
for b in javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver ; do
|
||||
for b in java javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver keytool pack200 rmid rmiregistry unpack200; do
|
||||
[ -L /usr/bin/$b -a "`readlink /usr/bin/$b`" != "/etc/alternatives/$b" ] && rm -f /usr/bin/$b
|
||||
/usr/sbin/update-alternatives --install %{_bindir}/$b $b %{sdkbindir}/$b %{altver}
|
||||
/usr/sbin/update-alternatives --install %{_bindir}/$b $b %{sdkbindir}/$b %{altverjdk}
|
||||
done
|
||||
# legacy
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/jdk jdk %{_jvmdir}/%{sdklnk} %{altver}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/jdk jdk %{_jvmdir}/%{sdklnk} %{altverjdk}
|
||||
# default
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver}-openjdk jdk_%{javaver}_openjdk %{_jvmdir}/%{sdklnk} %{altver}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver}-openjdk jdk_%{javaver}_openjdk %{_jvmdir}/%{sdklnk} %{altverjdk}
|
||||
# x eclipse
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver} jdk_%{javaver} %{_jvmdir}/%{sdklnk} %{altver}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-openjdk jdk_openjdk %{_jvmdir}/%{sdklnk} %{altver}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java jdk_java %{_jvmdir}/%{sdklnk} %{altver}
|
||||
|
||||
# /usr/sbin/update-alternatives --install %{_jvmjardir}/jdk jdk_exports %{_jvmjardir}/%{sdklnk} %{altver}
|
||||
# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver}-openjdk jdk_%{javaver}_openjdk_exports %{_jvmjardir}/%{sdklnk} %{altver}
|
||||
# /usr/sbin/update-alternatives --install %{_jvmjardir}/java jdk_java_exports %{_jvmjardir}/%{sdklnk} %{altver}
|
||||
# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-openjdk jdk_openjdk_exports %{_jvmjardir}/%{sdklnk} %{altver}
|
||||
# /usr/sbin/update-alternatives --install %{_jvmjardir}/java-%{javaver} jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk} %{altver}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-%{javaver} jdk_%{javaver} %{_jvmdir}/%{sdklnk} %{altverjdk}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java-openjdk jdk_openjdk %{_jvmdir}/%{sdklnk} %{altverjdk}
|
||||
/usr/sbin/update-alternatives --install %{javaprefix}/java jdk_java %{_jvmdir}/%{sdklnk} %{altverjdk}
|
||||
fi
|
||||
:
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ]; then
|
||||
for b in javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver ; do
|
||||
for b in java javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver keytool pack200 rmid rmiregistry unpack200; do
|
||||
/usr/sbin/update-alternatives --remove $b \
|
||||
%{sdkbindir}/$b
|
||||
done
|
||||
|
||||
/usr/sbin/update-alternatives --remove jdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_%{javever}_openjdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_java %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_openjdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_%{javaver} %{_jvmdir}/%{sdklnk}
|
||||
|
||||
# /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_%{javaver}_openjdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_openjdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
|
||||
|
||||
fi
|
||||
:
|
||||
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then
|
||||
for b in javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver ; do
|
||||
for b in java javac jar jarsigner javadoc javap jconsole jdb jinfo jmap jps jrunscript jstack jstat jstatd rmic serialver keytool pack200 rmid rmiregistry unpack200; do
|
||||
/usr/sbin/update-alternatives --remove $b \
|
||||
%{sdkbindir}/$b
|
||||
done
|
||||
|
||||
/usr/sbin/update-alternatives --remove jdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_%{javaver}_openjdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_java %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_openjdk %{_jvmdir}/%{sdklnk}
|
||||
/usr/sbin/update-alternatives --remove jdk_%{javaver} %{_jvmdir}/%{sdklnk}
|
||||
|
||||
# /usr/sbin/update-alternatives --remove jdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_%{javaver}_openjdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_java_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_openjdk_exports %{_jvmjardir}/%{sdklnk}
|
||||
# /usr/sbin/update-alternatives --remove jdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
|
||||
|
||||
fi
|
||||
:
|
||||
|
||||
@ -644,6 +622,10 @@ fi
|
||||
%doc README
|
||||
|
||||
%changelog
|
||||
* Mon Jan 25 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 11.0.10_9-1mamba
|
||||
- update to 11.0.10_9
|
||||
- java-opendk11: give higher priority alternatives to binaries than jre
|
||||
|
||||
* Tue Dec 22 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 11.0.10_7-1mamba
|
||||
- update to 11.0.10_7
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user