redirected bugs to non portable compoment
This commit is contained in:
parent
0066a17fe1
commit
8a7656ebac
|
@ -360,11 +360,11 @@
|
||||||
# Define what url should JVM offer in case of a crash report
|
# Define what url should JVM offer in case of a crash report
|
||||||
# order may be important, epel may have rhel declared
|
# order may be important, epel may have rhel declared
|
||||||
%if 0%{?epel}
|
%if 0%{?epel}
|
||||||
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{name}&version=epel%{epel}
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora%20EPEL&component=%{component}&version=epel%{epel}
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
# Does not work for rawhide, keeps the version field empty
|
# Does not work for rawhide, keeps the version field empty
|
||||||
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{name}&version=%{fedora}
|
%global oj_vendor_bug_url https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora&component=%{component}&version=%{fedora}
|
||||||
%else
|
%else
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
%global oj_vendor_bug_url https://access.redhat.com/support/cases/
|
||||||
|
@ -550,6 +550,10 @@ ExcludeArch: %{ix86}
|
||||||
# Prevent brp-java-repack-jars from being run
|
# Prevent brp-java-repack-jars from being run
|
||||||
%global __jar_repack 0
|
%global __jar_repack 0
|
||||||
|
|
||||||
|
# portables have grown out of its component, moving back to java-x-vendor
|
||||||
|
# this expression, when declared as global, filled component with java-x-vendor portable
|
||||||
|
%define component %(echo %{name} | sed "s;-portable;;g")
|
||||||
|
|
||||||
Name: java-latest-%{origin}-portable
|
Name: java-latest-%{origin}-portable
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
# This package needs `.rolling` as part of Release so as to not conflict on install with
|
||||||
|
@ -567,11 +571,6 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}.rolling%{?dist}
|
||||||
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
# provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0".
|
||||||
|
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
|
|
||||||
# portables have grown out of its component, moving back to java-x-vendor
|
|
||||||
# this expression, when declared as global, filled component with java-x-vendor portable
|
|
||||||
%define component %(echo %{name} | sed "s;-portable;;g")
|
|
||||||
|
|
||||||
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
|
Summary: %{origin_nice} %{featurever} Runtime Environment portable edition
|
||||||
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
# Groups are only used up to RHEL 8 and on Fedora versions prior to F30
|
||||||
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
%if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30)
|
||||||
|
@ -991,7 +990,6 @@ if [ $prioritylength -ne 8 ] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# OpenJDK patches
|
# OpenJDK patches
|
||||||
|
|
||||||
%if %{system_libs}
|
%if %{system_libs}
|
||||||
# Remove libraries that are linked by both static and dynamic builds
|
# Remove libraries that are linked by both static and dynamic builds
|
||||||
sh %{SOURCE12} %{top_level_dir_name}
|
sh %{SOURCE12} %{top_level_dir_name}
|
||||||
|
@ -1307,7 +1305,6 @@ function packagejdk() {
|
||||||
pushd ${imagesdir}
|
pushd ${imagesdir}
|
||||||
|
|
||||||
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
|
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
|
||||||
mkdir -p ${packagesdir}
|
|
||||||
|
|
||||||
if [ "x$suffix" = "x" ] ; then
|
if [ "x$suffix" = "x" ] ; then
|
||||||
nameSuffix=""
|
nameSuffix=""
|
||||||
|
@ -1404,7 +1401,6 @@ packFullPatchedSources
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
for suffix in %{build_loop} ; do
|
for suffix in %{build_loop} ; do
|
||||||
|
|
||||||
if [ "x$suffix" = "x" ] ; then
|
if [ "x$suffix" = "x" ] ; then
|
||||||
debugbuild=release
|
debugbuild=release
|
||||||
else
|
else
|
||||||
|
@ -1484,7 +1480,7 @@ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
||||||
|
|
||||||
# Check Shenandoah is enabled
|
# Check Shenandoah is enabled
|
||||||
%if %{use_shenandoah_hotspot}
|
%if %{use_shenandoah_hotspot}
|
||||||
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
|
$JAVA_HOME/bin/java -XX:+UseShenandoahGC -version
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Check unlimited policy has been used
|
# Check unlimited policy has been used
|
||||||
|
@ -1684,7 +1680,6 @@ for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
||||||
done
|
done
|
||||||
|
|
||||||
%if %{include_normal_build}
|
%if %{include_normal_build}
|
||||||
|
|
||||||
%files
|
%files
|
||||||
# main package builds always
|
# main package builds always
|
||||||
%{_jvmdir}/%{jreportablearchiveForFiles}
|
%{_jvmdir}/%{jreportablearchiveForFiles}
|
||||||
|
|
Loading…
Reference in New Issue