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

Sync the copy of the portable specfile with the latest update

Browse Source 
Related: RHEL-118771
Related: RHEL-119468
This commit is contained in:
Andrew Hughes 2025-10-18 13:20:57 +01:00
parent aa9a9d3319
commit fd882250c0
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
java-21-openjdk-portable.specfile
View File

@ -329,7 +329,7 @@
# New Version-String scheme-style defines # New Version-String scheme-style defines
%global featurever 21 %global featurever 21
%global interimver 0 %global interimver 0
%global updatever 8 %global updatever 9
%global patchver 0 %global patchver 0
# buildjdkver is usually same as %%{featurever}, # buildjdkver is usually same as %%{featurever},
# but in time of bootstrap of next jdk, it is featurever-1, # but in time of bootstrap of next jdk, it is featurever-1,
@ -393,7 +393,7 @@
%global origin_nice OpenJDK %global origin_nice OpenJDK
%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 9 %global buildver 10
%global rpmrelease 1 %global rpmrelease 1
#%%global tagsuffix %%{nil} #%%global tagsuffix %%{nil}
# 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
@ -703,7 +703,7 @@ BuildRequires: devtoolset-%{dtsversion}-gcc
BuildRequires: devtoolset-%{dtsversion}-gcc-c++ BuildRequires: devtoolset-%{dtsversion}-gcc-c++
%else %else
%ifarch %{devkit_arches} %ifarch %{devkit_arches}
BuildRequires: %{devkit_name} >= 1.0-9 BuildRequires: %{devkit_name} >= 1.1
%else %else
# Earlier versions have a bug in tree vectorization on PPC # Earlier versions have a bug in tree vectorization on PPC
BuildRequires: gcc >= 4.8.3-8 BuildRequires: gcc >= 4.8.3-8
@ -759,12 +759,12 @@ BuildRequires: libjpeg-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
%else %else
# Version in src/java.desktop/share/legal/freetype.md # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
Provides: bundled(freetype) = 2.13.3 Provides: bundled(freetype) = 2.13.3
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
Provides: bundled(giflib) = 5.2.2 Provides: bundled(giflib) = 5.2.2
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
Provides: bundled(harfbuzz) = 10.4.0 Provides: bundled(harfbuzz) = 11.2.0
# Version in src/java.desktop/share/native/liblcms/lcms2.h # Version in src/java.desktop/share/native/liblcms/lcms2.h
Provides: bundled(lcms2) = 2.17.0 Provides: bundled(lcms2) = 2.17.0
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
@ -1043,6 +1043,14 @@ done
tar -C devkit --strip-components=1 -xzf ${devkittarball} tar -C devkit --strip-components=1 -xzf ${devkittarball}
DEVKIT_ROOT=$(pwd)/devkit DEVKIT_ROOT=$(pwd)/devkit
source ${DEVKIT_ROOT}/devkit.info source ${DEVKIT_ROOT}/devkit.info
# Install annobin plugin as gcc does
ANNOBIN_DIR=${DEVKIT_ROOT}/lib/gcc/%{_target_cpu}-%{_target_os}-gnu/*/plugin
echo "annobin directory = $(echo ${ANNOBIN_DIR})"
pushd ${ANNOBIN_DIR}
cp annobin.so.0.0.0 gcc-annobin.so.0.0.0
rm -f gcc-annobin.so.0 gcc-annobin.so
ln -s gcc-annobin.so.0.0.0 gcc-annobin.so.0
ln -s gcc-annobin.so.0.0.0 gcc-annobin.so
echo "Installed ${DEVKIT_NAME} devkit" echo "Installed ${DEVKIT_NAME} devkit"
%else %else
%if 0%{?centos} > 0 %if 0%{?centos} > 0
@ -1085,9 +1093,6 @@ EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-mstackrealign|-mincoming-stack
EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')" EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming-stack-boundary=2 -mpreferred-stack-boundary=4|')"
%endif %endif
%ifarch %{devkit_arches} %ifarch %{devkit_arches}
# Remove annobin plugin reference which isn't available in the devkit
EXTRA_CFLAGS="$(echo ${EXTRA_CFLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')"
EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1||')"
# Force DWARF 4 for compatibility # Force DWARF 4 for compatibility
EXTRA_CFLAGS="${EXTRA_CFLAGS} -gdwarf-4" EXTRA_CFLAGS="${EXTRA_CFLAGS} -gdwarf-4"
EXTRA_CPP_FLAGS="${EXTRA_CPP_FLAGS} -gdwarf-4" EXTRA_CPP_FLAGS="${EXTRA_CPP_FLAGS} -gdwarf-4"
@ -1939,7 +1944,22 @@ done
%endif %endif
%changelog %changelog
* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1.1 * Fri Oct 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.9.0.10-1
- Update to jdk-21.0.9+10 (GA)
- Update release notes to 21.0.9+10
- Bump harfbuzz version to 11.2.0 following JDK-8355528
- Add NEWS corrections from Thomas
- Use double spacing consistently in notes for this release
- Correct 11u release reference to corresponding 21u release as pointed out by Kieran
- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. **
- Resolves: OPENJDK-4131
* Fri Oct 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-2
- Depend on a devkit with the annobin plugin and stop filtering it out of the build flags
- Install annobin plugin as gcc-annobin in the same way as the gcc spec file
- Resolves: OPENJDK-4142
* Thu Jul 10 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.8.0.9-1
- Update to jdk-21.0.8+9 (GA) - Update to jdk-21.0.8+9 (GA)
- Update release notes to 21.0.8+9 - Update release notes to 21.0.8+9
- Switch to GA mode - Switch to GA mode

1
java-21-openjdk.spec
View File

@ -2478,6 +2478,7 @@ exit 0
- Add NEWS corrections from Thomas - Add NEWS corrections from Thomas
- Use double spacing consistently in notes for this release - Use double spacing consistently in notes for this release
- Correct 11u release reference to corresponding 21u release as pointed out by Kieran - Correct 11u release reference to corresponding 21u release as pointed out by Kieran
- Sync the copy of the portable specfile with the latest update
- ** This tarball is embargoed until 2025-10-21 @ 1pm PT. ** - ** This tarball is embargoed until 2025-10-21 @ 1pm PT. **
- Resolves: RHEL-118771 - Resolves: RHEL-118771
- Resolves: RHEL-119468 - Resolves: RHEL-119468