diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index e1dc8dbbc51202a41d1b1101957265c87ba0519c..5653ac40826a0075a3dfe88bc060f1bf5c54a34a 100644 --- a/java-11-alibaba-dragonwell.spec +++ b/java-11-alibaba-dragonwell.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 3 %bcond_without fastdebug %bcond_without slowdebug @@ -13,6 +13,8 @@ %global include_staticlibs 0 %endif +%global is_system_jdk 0 + %global major_ver 11 %global inter_ver 0 %global update_ver 17 @@ -74,6 +76,22 @@ %define sdkbindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} %define jrebindir() %{expand:%{_jvmdir}/%{sdkdir -- %{?1}}/bin} %global rpm_state_dir %{_localstatedir}/lib/rpm-state/ + +%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libsystemconf[.]so.*|libunpack[.]so.*|libzip[.]so.* +%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.* + +%if %is_system_jdk +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude_from ^.*/%{uniquesuffix -- %{slowdebug_build}}/.*$ +%global __requires_exclude_from ^.*/%{uniquesuffix -- %{slowdebug_build}}/.*$ +%global __provides_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_build}}/.*$ +%global __requires_exclude_from ^.*/%{uniquesuffix -- %{fastdebug_build}}/.*$ +%else +# Don't generate provides/requires for JDK provided shared libraries at all. +%global __provides_exclude ^(%{_privatelibs}|%{_publiclibs})$ +%global __requires_exclude ^(%{_privatelibs}|%{_publiclibs})$ +%endif %global family %{name}.%{_arch} %global family_noarch %{name} @@ -139,7 +157,7 @@ %global target images hotspot Name: java-11-alibaba-dragonwell -Epoch: 2 +Epoch: 3 Version: %{newdragonwellver}.%{alibaba_ver} Release: %{anolis_release}%{?dist} Summary: Alibaba Dragonwell11 JDK @@ -273,6 +291,15 @@ Requires: %{name}-headless = %{epoch}:%{version}-%{release} # Where recommendations are available, recommend Gtk+ for the Swing look and feel Recommends: gtk3 +%if %is_system_jdk +Provides: java = %{epoch}:%{version}-%{release} +Provides: jre = %{epoch}:%{version}-%{release} +Provides: java-%{origin} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin} = %{epoch}:%{version}-%{release} +Provides: jre-%{drag_origin} = %{epoch}:%{version}-%{release} +%endif + Provides: java-%{major_ver} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{?_isa} = %{epoch}:%{version}-%{release} @@ -292,6 +319,12 @@ Provides: java-%{major_ver}-demo = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-demo = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-demo = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-demo = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-demo = %{epoch}:%{version}-%{release} +%endif + %description demo Alibaba Dragonwell11 demo @@ -312,6 +345,14 @@ Provides: java-%{major_ver}-%{drag_origin}-headless = %{epoch}:%{version}- Provides: java-%{drag_origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-headless = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} +Provides: jre-headless = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}-headless = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-headless = %{epoch}:%{version}-%{release} +Provides: jre-%{drag_origin}-headless = %{epoch}:%{version}-%{release} +%endif %description headless Alibaba Dragonwell11 headless @@ -329,6 +370,15 @@ Provides: java-sdk-%{major_ver} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{drag_origin} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-devel = %{epoch}:%{version}-%{release} +Provides: java-devel-%{origin} = %{epoch}:%{version}-%{release} +Provides: java-devel-%{drag_origin} = %{epoch}:%{version}-%{release} +Provides: java-sdk = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{origin} = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{drag_origin} = %{epoch}:%{version}-%{release} +%endif + %description devel Alibaba Dragonwell11 devel @@ -339,6 +389,12 @@ Provides: java-%{major_ver}-src = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-src = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-src = %{epoch}:%{version}-%{release} +Provides: java-{drag_origin}-src = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-src = %{epoch}:%{version}-%{release} +%endif + %description src Alibaba Dragonwell11 src @@ -359,6 +415,10 @@ Provides: java-%{major_ver}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-javadoc = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-javadoc = %{epoch}:%{version}-%{release} +%endif + %description javadoc Alibaba Dragonwell11 javadoc @@ -371,6 +431,10 @@ Provides: java-%{major_ver}-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-javadoc-zip = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-javadoc-zip = %{epoch}:%{version}-%{release} +%endif + %description javadoc-zip Alibaba Dragonwell11 javadoc zip @@ -381,6 +445,10 @@ Provides: java-%{major_ver}-jmods = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-jmods = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-jmods = %{epoch}:%{version}-%{release} +%endif + %description jmods Alibaba Dragonwell11 jmods @@ -400,6 +468,15 @@ Provides: jre-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{rele Provides: jre-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description slowdebug Alibaba Dragonwell11 Runtime Environment slowdebug @@ -421,6 +498,15 @@ Provides: jre-%{major_ver}-headless%{slowdebug_build} = %{epoch}:%{versio Provides: jre-%{major_ver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description headless-slowdebug Alibaba Dragonwell11 Runtime Environment headless slowdebug @@ -437,6 +523,15 @@ Provides: java-sdk-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-% Provides: java-sdk-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-devel-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-devel-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description devel-slowdebug Alibaba Dragonwell11 Runtime Environment devel slowdebug @@ -455,6 +550,10 @@ Provides: java-%{major_ver}-jmods%{slowdebug_build} = %{epoch}:%{version} Provides: java-%{major_ver}-%{origin}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description jmods-slowdebug Alibaba Dragonwell11 Runtime Environment jmods slowdebug @@ -465,6 +564,12 @@ Provides: java-%{major_ver}-demo%{slowdebug_build} = %{epoch}:%{version}- Provides: java-%{major_ver}-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description demo-slowdebug Alibaba Dragonwell11 Runtime Environment demo slowdebug @@ -475,6 +580,12 @@ Provides: java-%{major_ver}-src%{slowdebug_build} = %{epoch}:%{version}-% Provides: java-%{major_ver}-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-src%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description src-slowdebug Alibaba Dragonwell11 Runtime Environment src slowdebug %endif @@ -495,6 +606,15 @@ Provides: jre-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{rele Provides: jre-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description fastdebug Alibaba Dragonwell11 Runtime Environment fastdebug @@ -516,6 +636,14 @@ Provides: jre-%{major_ver}-headless%{fastdebug_build} = %{epoch}:%{versio Provides: jre-%{major_ver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: jre-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description headless-fastdebug Alibaba Dragonwell11 Runtime Environment headless fastdebug @@ -532,6 +660,15 @@ Provides: java-sdk-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-% Provides: java-sdk-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-devel-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-devel-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-sdk-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description devel-fastdebug Alibaba Dragonwell11 Runtime Environment devel fastdebug @@ -550,6 +687,10 @@ Provides: java-%{major_ver}-jmods%{fastdebug_build} = %{epoch}:%{version} Provides: java-%{major_ver}-%{origin}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description jmods-fastdebug Alibaba Dragonwell11 Runtime Environment jmods fastdebug @@ -560,6 +701,12 @@ Provides: java-%{major_ver}-demo%{fastdebug_build} = %{epoch}:%{version}- Provides: java-%{major_ver}-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description demo-fastdebug Alibaba Dragonwell11 Runtime Environment demo fastdebug @@ -570,6 +717,12 @@ Provides: java-%{major_ver}-src%{fastdebug_build} = %{epoch}:%{version}-% Provides: java-%{major_ver}-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} +%if %is_system_jdk +Provides: java-src%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} +Provides: java-%{drag_origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} +%endif + %description src-fastdebug Alibaba Dragonwell11 Runtime Environment src fastdebug %endif @@ -1569,6 +1722,7 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %config(noreplace) %{etcjavadir}/conf/wisp.properties %{_jvmdir}/%{sdkdir}/conf %{_jvmdir}/%{sdkdir}/lib/security +%if %is_system_jdk %ghost %{_bindir}/java %ghost %{_bindir}/alt-java %ghost %{_jvmdir}/jre @@ -1581,6 +1735,7 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %ghost %{_jvmdir}/jre-%{origin} %ghost %{_jvmdir}/jre-%{major_ver} %ghost %{_jvmdir}/jre-%{major_ver}-%{origin} +%endif %ghost %{_jvmdir}/%{sdkdir}/conf.rpmmoved %ghost %{_jvmdir}/%{sdkdir}/lib/security.rpmmoved @@ -1639,6 +1794,7 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %dir %{tapsetdirttapset} %dir %{tapsetdir} %{tapsetdir}/*%{_arch}.stp +%if %is_system_jdk %ghost %{_bindir}/javac %ghost %{_jvmdir}/java %ghost %{_bindir}/jlink @@ -1669,6 +1825,7 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %ghost %{_jvmdir}/java-%{origin} %ghost %{_jvmdir}/java-%{major_ver} %ghost %{_jvmdir}/java-%{major_ver}-%{origin} +%endif %files static-libs %dir %{_jvmdir}/%{sdkdir}/lib/static @@ -1691,12 +1848,22 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %files javadoc %doc %{_javadocdir}/%{uniquejavadocdir} %license %{_jvmdir}/%{sdkdir}/legal +%if %is_system_jdk %ghost %{_javadocdir}/java +%ghost %{_javadocdir}/java-%{origin} +%ghost %{_javadocdir}/java-%{major_ver} +%ghost %{_javadocdir}/java-%{major_ver}-%{origin} +%endif %files javadoc-zip %doc %{_javadocdir}/%{uniquejavadocdir}.zip %license %{_jvmdir}/%{sdkdir}/legal +%if %is_system_jdk %ghost %{_javadocdir}/java-zip +%ghost %{_javadocdir}/java-%{origin}.zip +%ghost %{_javadocdir}/java-%{major_ver}.zip +%ghost %{_javadocdir}/java-%{major_ver}-%{origin}.zip +%endif %endif %if %{with slowdebug} @@ -2082,6 +2249,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %endif %changelog +* Wed Feb 22 2023 happy_orange - 3:11.0.17.13.8-3 +- unset the java-11-alibaba-dragonwell is a system java + * Wed Feb 15 2023 Funda Wang - 2:11.0.17.13.8-2 - Update man page compression extension - Bump epcoh to easy upgrading from anolis 8