Skip to content

Commit d6f3b3b

Browse files
authored
Fix JDK21, JDK25 & JDK26 RPM installation directives (adoptium#1362)
1 parent 035c353 commit d6f3b3b

File tree

6 files changed

+23
-0
lines changed

6 files changed

+23
-0
lines changed

linux_new/jdk/rhel/src/main/packaging/temurin/26/temurin-26-jdk.template.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ Provides: libjsig.so%{?_isa}
9494
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
9595
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
9696

97+
# Do Not Allow JDK & JRE to co-exist (Temurin 26+ Policy) - https://github.com/adoptium/installer/issues/1360
98+
Conflicts: temurin-26-jre
99+
Conflicts: temurin-26-jre-headless
100+
97101
# Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which
98102
# is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353
99103
# lists the available options.

linux_new/jdk/suse/src/main/packaging/temurin/26/temurin-26-jdk.template.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ Provides: libjsig.so%{?_isa}
9494
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
9595
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
9696

97+
# Do Not Allow JDK & JRE to co-exist (Temurin 26+ Policy) - https://github.com/adoptium/installer/issues/1360
98+
Conflicts: temurin-26-jre
99+
Conflicts: temurin-26-jre-headless
100+
97101
# Avoid build failures on some distros due to missing build-id in binaries.
98102
%global debug_package %{nil}
99103
%global __brp_strip %{nil}

linux_new/jre/rhel/src/main/packaging/temurin/21/temurin-21-jre.template.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_ar
114114
%global debug_package %{nil}
115115
%global __brp_strip %{nil}
116116

117+
# Surpress /usr/lib/.build-id entries in the installed RPM (jre/jre-headless only)
118+
%global _build_id_links none
119+
117120
%description
118121
Eclipse Temurin JRE is an OpenJDK-based runtime environment to execute
119122
applications and components using the programming language Java.

linux_new/jre/rhel/src/main/packaging/temurin/25/temurin-25-jre.template.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK25U-jre_%{vers_ar
110110
%global debug_package %{nil}
111111
%global __brp_strip %{nil}
112112

113+
# Surpress /usr/lib/.build-id entries in the installed RPM (jre/jre-headless only)
114+
%global _build_id_links none
115+
113116
%description
114117
Eclipse Temurin JRE is an OpenJDK-based runtime environment to execute
115118
applications and components using the programming language Java.

linux_new/jre/rhel/src/main/packaging/temurin/26/temurin-26-jre.template.j2

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,16 @@
2626
%if %{with headful}
2727
Name: temurin-26-jre
2828
%global altname java-26-temurin-jre
29+
# Prevent headful and headless JRE being installed together
30+
Conflicts: temurin-26-jre-headless
2931
%else
3032
Name: temurin-26-jre-headless
3133
%global altname java-26-temurin-jre-headless
34+
# Prevent headful and headless JRE being installed together
35+
Conflicts: temurin-26-jre
3236
%endif
37+
# Prevent JDK and any JRE variant being installed together
38+
Conflicts: temurin-26-jdk
3339

3440
Version: %{spec_version}
3541
Release: %{spec_release}

linux_new/jre/suse/src/main/packaging/temurin/26/temurin-26-jre.template.j2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ Provides: libjsig.so%{?_isa}
8585
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
8686
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK26U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
8787

88+
# Do Not Allow JDK & JRE to co-exist (Temurin 26+ Policy) - https://github.com/adoptium/installer/issues/1360
89+
Conflicts: temurin-26-jdk
90+
8891
# Avoid build failures on some distros due to missing build-id in binaries.
8992
%global debug_package %{nil}
9093
%global __brp_strip %{nil}

0 commit comments

Comments
 (0)