rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Define portablesuffix according to whether pkgos is defined or not

Browse Source 
Place the pkgos definition high enough that it is usable by portablesuffix.

Related: RHEL-30946
This commit is contained in:
Andrew Hughes 2024-04-12 16:48:02 +01:00
parent 5b22e08152
commit 738cf78b0a
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
java-21-openjdk.spec
View File

@ -143,6 +143,13 @@
# Set of architectures where we verify backtraces with gdb # Set of architectures where we verify backtraces with gdb
%global gdb_arches %{jit_arches} %{zero_arches} %global gdb_arches %{jit_arches} %{zero_arches}
# Define the OS the portable JDK is built on
# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
# equals 'rhel7' for openjdk-portable-rhel-7 builds
%if 0%{?centos} == 0
%global pkgos rhel7
%endif
# By default, we build a debug build during main build on JIT architectures # By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug} %if %{with slowdebug}
%ifarch %{debug_arches} %ifarch %{debug_arches}
@ -351,10 +358,10 @@
%global top_level_dir_name %{vcstag} %global top_level_dir_name %{vcstag}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 13 %global buildver 13
%global rpmrelease 1 %global rpmrelease 2
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %global portablerelease 1
%global portablesuffix el9 %global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el9}
%global portablebuilddir /builddir/build/BUILD %global portablebuilddir /builddir/build/BUILD
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@ -1262,11 +1269,6 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
# Prevent brp-java-repack-jars from being run # Prevent brp-java-repack-jars from being run
%global __jar_repack 0 %global __jar_repack 0
# Define the OS the portable JDK is built on
# Only used on RHEL
%if 0%{?centos} == 0
%global pkgos rhel7
%endif
# Define the root name of the portable packages # Define the root name of the portable packages
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}} %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
@ -2483,6 +2485,10 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
- Define portablesuffix according to whether pkgos is defined or not
- Related: RHEL-30946
* Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1 * Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1
- Update to jdk-21.0.2+13 (GA) - Update to jdk-21.0.2+13 (GA)
- Sync the copy of the portable specfile with the latest update - Sync the copy of the portable specfile with the latest update