diff --git a/java-11-alibaba-dragonwell.spec b/java-11-alibaba-dragonwell.spec index c30f273fa4a31556e43b13b5b85ebb9b522910b6..80d36a4dccc64dbf23048bfccd4224af7cce33a5 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 @@ -251,6 +251,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: zip BuildRequires: unzip +BuildRequires: javapackages-filesystem BuildRequires: java-%{major_ver}-openjdk-devel = 1:11.0.14.1.1 # Zero-assembler build requirement BuildRequires: libffi-devel @@ -271,20 +272,14 @@ Requires: %{name}-headless = %{epoch}:%{version}-%{release} # Where recommendations are available, recommend Gtk+ for the Swing look and feel Recommends: gtk3 -Provides: java = %{epoch}:%{version}-%{release} Provides: java-%{major_ver} = %{epoch}:%{version}-%{release} -Provides: java-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin} = %{epoch}:%{version}-%{release} %description Alibaba Dragonwell11 JDK @@ -295,9 +290,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} 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} -Provides: java-demo = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-demo = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}-demo = %{epoch}:%{version}-%{release} %description demo Alibaba Dragonwell11 demo @@ -308,20 +300,16 @@ Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs Requires: nss +# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros +Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-headless = %{epoch}:%{version}-%{release} Provides: java-%{drag_origin}-headless = %{epoch}:%{version}-%{release} -Provides: jre-headless = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}-headless = %{epoch}:%{version}-%{release} -Provides: jre-%{major_ver}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless = %{epoch}:%{version}-%{release} %description headless @@ -336,12 +324,6 @@ Provides: java-%{major_ver}-devel = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-devel%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-devel = %{epoch}:%{version}-%{release} -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} 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} @@ -355,9 +337,6 @@ Requires: %{name}-headless = %{epoch}:%{version}-%{release} 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} -Provides: java-src = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-src = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}-src = %{epoch}:%{version}-%{release} %description src Alibaba Dragonwell11 src @@ -372,9 +351,9 @@ Alibaba Dragonwell11 static libs %package javadoc Summary: Alibaba Dragonwell11 javadoc +Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-javadoc = %{epoch}:%{version}-%{release} 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} @@ -384,9 +363,9 @@ Alibaba Dragonwell11 javadoc %package javadoc-zip Summary: Alibaba Dragonwell11 javadoc zip +Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-javadoc-zip = %{epoch}:%{version}-%{release} 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} @@ -397,7 +376,6 @@ Alibaba Dragonwell11 javadoc zip %package jmods Summary: Alibaba Dragonwell11 jmods Requires: %{name}-devel = %{epoch}:%{version}-%{release} -Provides: java-jmods = %{epoch}:%{version}-%{release} 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} @@ -412,20 +390,14 @@ Requires: fontconfig Requires: xorg-x11-fonts-Type1 Requires: libXcomposite Requires: %{name}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %description slowdebug Alibaba Dragonwell11 Runtime Environment slowdebug @@ -436,20 +408,16 @@ Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs Requires: nss +# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros +Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %description headless-slowdebug @@ -464,12 +432,6 @@ Provides: java-%{major_ver}-devel%{slowdebug_build} = %{epoch}:%{version} Provides: java-%{major_ver}-devel%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} -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-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-sdk-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} @@ -488,7 +450,6 @@ Alibaba Dragonwell11 Runtime Environment static libs slowdebug %package jmods-slowdebug Summary: Alibaba Dragonwell11 Runtime Environment jmods slowdebug Requires: %{name}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} @@ -502,9 +463,6 @@ Requires: %{name}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} %description demo-slowdebug Alibaba Dragonwell11 Runtime Environment demo slowdebug @@ -515,9 +473,6 @@ Requires: %{name}-headless%{slowdebug_build} = %{epoch}:%{version}-%{rele Provides: java-%{major_ver}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} -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} %description src-slowdebug Alibaba Dragonwell11 Runtime Environment src slowdebug @@ -530,20 +485,14 @@ Requires: fontconfig Requires: xorg-x11-fonts-Type1 Requires: libXcomposite Requires: %{name}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %description fastdebug Alibaba Dragonwell11 Runtime Environment fastdebug @@ -554,20 +503,16 @@ Requires: tzdata-java >= 2015d Requires: lksctp-tools Requires: cups-libs Requires: nss +# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros +Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_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} Provides: jre-%{major_ver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %description headless-fastdebug @@ -582,12 +527,6 @@ Provides: java-%{major_ver}-devel%{fastdebug_build} = %{epoch}:%{version} Provides: java-%{major_ver}-devel%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} -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} Provides: java-sdk-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} @@ -606,7 +545,6 @@ Alibaba Dragonwell11 Runtime Environment static libs fastdebug %package jmods-fastdebug Summary: Alibaba Dragonwell11 Runtime Environment jmods fastdebug Requires: %{name}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} @@ -620,9 +558,6 @@ Requires: %{name}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} -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} %description demo-fastdebug Alibaba Dragonwell11 Runtime Environment demo fastdebug @@ -633,9 +568,6 @@ Requires: %{name}-headless%{fastdebug_build} = %{epoch}:%{version}-%{rele Provides: java-%{major_ver}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} -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} %description src-fastdebug Alibaba Dragonwell11 Runtime Environment src fastdebug @@ -2149,6 +2081,10 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %endif %changelog +* Tue Jun 20 2022 happy_orange - 1:11.0.15.11.9-3 +- add javapackages-filesystem in requires +- remove the system_jdk in 1.8.0 + * Tue Jun 14 2022 happy_orange - 1:11.0.15.11.9-2 - add script in post and postun