diff --git a/java-1.8.0-alibaba-dragonwell.spec b/java-1.8.0-alibaba-dragonwell.spec index fa46e56b53c9ee5cd683be0e6707d5e095b9fe64..1762b4adbb4c3cd86a34903375fd2889f58372d6 100644 --- a/java-1.8.0-alibaba-dragonwell.spec +++ b/java-1.8.0-alibaba-dragonwell.spec @@ -332,20 +332,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-%{javaver} = %{epoch}:%{version}-%{release} -Provides: java-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre = %{epoch}:%{version}-%{release} Provides: jre-%{javaver} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin} = %{epoch}:%{version}-%{release} %description Alibaba Dragonwell 1.8.0 JDK @@ -356,9 +350,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-demo = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-demo = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 demo @@ -373,18 +364,12 @@ Requires: nss Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-headless = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}-headless = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin}-headless = %{epoch}:%{version}-%{release} %description headless @@ -399,12 +384,6 @@ Provides: java-%{javaver}-devel = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-devel%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-devel = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{drag_origin} = %{epoch}:%{version}-%{release} @@ -418,9 +397,6 @@ Requires: %{name}-headless = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-src = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-src = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 src @@ -430,7 +406,6 @@ Summary: Alibaba Dragonwell 1.8.0 javadoc Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} Requires: javapackages-filesystem -Provides: java-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}-javadoc = %{epoch}:%{version}-%{release} @@ -443,7 +418,6 @@ Summary: Alibaba Dragonwell 1.8.0 javadoc zip Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} Requires: javapackages-filesystem -Provides: java-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}-javadoc-zip = %{epoch}:%{version}-%{release} @@ -458,20 +432,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-%{javaver}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %description slowdebug Alibaba Dragonwell 1.8.0 Runtime Environment slowdebug @@ -486,18 +454,12 @@ Requires: nss Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %description headless-slowdebug @@ -512,12 +474,6 @@ Provides: java-%{javaver}-devel%{slowdebug_build} = %{epoch}:%{version}- Provides: java-%{javaver}-devel%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} @@ -531,9 +487,6 @@ Requires: %{name}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 Runtime Environment demo slowdebug @@ -544,9 +497,6 @@ Requires: %{name}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 Runtime Environment src slowdebug @@ -559,20 +509,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-%{javaver}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: java-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{drag_origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -Provides: jre%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %description fastdebug Alibaba Dragonwell 1.8.0 Runtime Environment fastdebug @@ -587,18 +531,12 @@ Requires: nss Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -Provides: java-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-headless%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: java-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -Provides: jre-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{javaver}-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %description headless-fastdebug @@ -613,12 +551,6 @@ Provides: java-%{javaver}-devel%{fastdebug_build} = %{epoch}:%{version}- Provides: java-%{javaver}-devel%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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-%{javaver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{javaver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} @@ -632,9 +564,6 @@ Requires: %{name}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 Runtime Environment demo fastdebug @@ -645,9 +574,6 @@ Requires: %{name}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-%{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 Dragonwell 1.8.0 Runtime Environment src fastdebug @@ -1760,7 +1686,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %{_jvmdir}/%{sdkdir}/jre/lib/%{arch_dir}/libawt_xawt.so %{_jvmdir}/%{sdkdir}/jre/lib/%{arch_dir}/libjawt.so %{_jvmdir}/%{sdkdir}/jre/bin/policytool -%ghost %{_bindir}/policytool %files headless %defattr(-,root,root,-) @@ -1916,17 +1841,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %dir %{_jvmdir}/%{jredir}/lib/cmm %dir %{_jvmdir}/%{jredir}/lib/ext %dir %{_jvmdir}/%{jredir}/lib/jfr -%ghost %{_bindir}/java -%ghost %{_jvmdir}/jre -%ghost %{_bindir}/jjs -%ghost %{_bindir}/keytool -%ghost %{_bindir}/orbd -%ghost %{_bindir}/pack200 -%ghost %{_bindir}/rmid -%ghost %{_bindir}/rmiregistry -%ghost %{_bindir}/servertool -%ghost %{_bindir}/tnameserv -%ghost %{_bindir}/unpack200 %files devel %defattr(-,root,root,-) @@ -2027,51 +1941,6 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %dir %{tapsetdirttapset} %dir %{tapsetdir} %{tapsetdir}/*%{_arch}.stp -%ghost %{_jvmdir}/java -%ghost %{_bindir}/appletviewer -%ghost %{_bindir}/clhsdb -%ghost %{_bindir}/extcheck -%ghost %{_bindir}/hsdb -%ghost %{_bindir}/idlj -%ghost %{_bindir}/jar -%ghost %{_bindir}/jarsigner -%ghost %{_bindir}/java -%ghost %{_bindir}/java-rmi.cgi -%ghost %{_bindir}/javac -%ghost %{_bindir}/javadoc -%ghost %{_bindir}/javah -%ghost %{_bindir}/javap -%ghost %{_bindir}/jcmd -%ghost %{_bindir}/jconsole -%ghost %{_bindir}/jdb -%ghost %{_bindir}/jdeps -%ghost %{_bindir}/jgroup -%ghost %{_bindir}/jhat -%ghost %{_bindir}/jinfo -%ghost %{_bindir}/jjs -%ghost %{_bindir}/jmap -%ghost %{_bindir}/jps -%ghost %{_bindir}/jrunscript -%ghost %{_bindir}/jsadebugd -%ghost %{_bindir}/jstack -%ghost %{_bindir}/jstat -%ghost %{_bindir}/jstatd -%ghost %{_bindir}/keytool -%ghost %{_bindir}/native2ascii -%ghost %{_bindir}/orbd -%ghost %{_bindir}/pack200 -%ghost %{_bindir}/policytool -%ghost %{_bindir}/rmic -%ghost %{_bindir}/rmid -%ghost %{_bindir}/rmiregistry -%ghost %{_bindir}/schemagen -%ghost %{_bindir}/serialver -%ghost %{_bindir}/servertool -%ghost %{_bindir}/tnameserv -%ghost %{_bindir}/unpack200 -%ghost %{_bindir}/wsgen -%ghost %{_bindir}/wsimport -%ghost %{_bindir}/xjc %files demo %license %{_jvmdir}/%{jredir}/LICENSE @@ -2085,11 +1954,9 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %files javadoc %doc %{_javadocdir}/%{uniquejavadocdir} %license %{installoutputdir}/images/j2sdk-image/jre/LICENSE -%ghost %{_javadocdir}/java %files javadoc-zip %doc %{_javadocdir}/%{uniquejavadocdir}.zip -%ghost %{_javadocdir}/java-zip %endif %if %{with slowdebug} @@ -2644,6 +2511,7 @@ alternatives --install %{_jvmdir}/java-%{javaver}-%{origin} $key %{_jvmdir}/%{sd %changelog * Mon Jun 20 2022 happy_orange - 1:1.8.0.332-3 - add javapackages-filesystem in requires +- remove the system_jdk in 1.8.0 * Wed Jun 15 2022 happy_orange - 1:1.8.0.332-2 - fix some error in postun of headless fastdebug and slow fastdebug