Skip to content

Commit

Permalink
JDK23 Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
steelhead31 committed Sep 19, 2024
1 parent c5905c6 commit fe5ec62
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 33 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global upstream_version 23.0.0+37
%global upstream_version 23+37
# Only [A-Za-z0-9.] allowed in version:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
# also not very intuitive:
Expand All @@ -8,7 +8,7 @@
%global spec_release 0
%global priority 2300

%global source_url_base https://github.com/adoptium/temurin22-binaries/releases/download
%global source_url_base https://github.com/adoptium/temurin23-binaries/releases/download
%global upstream_version_url %(echo %{upstream_version} | sed 's/\+/%%2B/g')
%global upstream_version_no_plus %(echo %{upstream_version} | sed 's/\+/_/g')
%global java_provides openjdk
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global upstream_version 23.0.0+37
%global upstream_version 23+37
# Only [A-Za-z0-9.] allowed in version:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
# also not very intuitive:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global upstream_version 23.0.0+37
%global upstream_version 23+37
# Only [A-Za-z0-9.] allowed in version:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
# also not very intuitive:
Expand Down
55 changes: 26 additions & 29 deletions linux/jre/suse/src/main/packaging/temurin/23/temurin-23-jre.spec
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
%global upstream_version 22.0.2+9
%global upstream_version 23+37
# Only [A-Za-z0-9.] allowed in version:
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
# also not very intuitive:
# $ rpmdev-vercmp 22.0.0.0.0___22.0.0.0.0+1
# 22.0.0.0.0___1 == 22.0.0.0.0+36
%global spec_version 22.0.2.0.0.9
%global spec_release 1
%global priority 2200
# $ rpmdev-vercmp 23.0.0.0.0___23.0.0.0.0+1
# 23.0.0.0.0___1 == 23.0.0.0.0+37
%global spec_version 23.0.0.0.0.37
%global spec_release 0
%global priority 2300

%global source_url_base https://github.com/adoptium/temurin22-binaries/releases/download

%global source_url_base https://github.com/adoptium/temurin23-binaries/releases/download
%global upstream_version_url %(echo %{upstream_version} | sed 's/\+/%%2B/g')
%global upstream_version_no_plus %(echo %{upstream_version} | sed 's/\+/_/g')
%global java_provides openjre
Expand Down Expand Up @@ -67,10 +68,10 @@
%global sha_src_num 1
%endif

Name: temurin-22-jre
Name: temurin-23-jre
Version: %{spec_version}
Release: %{spec_release}
Summary: Eclipse Temurin 22 JRE
Summary: Eclipse Temurin 23 JRE

Group: java
License: GPLv2 with exceptions
Expand Down Expand Up @@ -101,29 +102,29 @@ Requires: libz1%{?_isa}
Requires: fontconfig%{?_isa}

Provides: jre
Provides: jre-22
Provides: jre-22-headless
Provides: jre-22-%{java_provides}
Provides: jre-22-%{java_provides}-headless
Provides: jre-23
Provides: jre-23-headless
Provides: jre-23-%{java_provides}
Provides: jre-23-%{java_provides}-headless
Provides: jre-headless
Provides: jre-%{java_provides}
Provides: jre-%{java_provides}-headless

# First architecture (x86_64)
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Second architecture (ppc64le)
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Third architecture (aarch64)
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fifth architecture (riscv64)
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK23U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

# Avoid build failures on some distros due to missing build-id in binaries.
%global debug_package %{nil}
Expand Down Expand Up @@ -177,9 +178,5 @@ fi
%{prefix}

%changelog
* Wed Jul 17 2024 Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> 22.0.2.0.0.9-1
- Eclipse Temurin 22.0.2+9 release.
* Wed Apr 17 2024 Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> 22.0.1.0.0.8-1
- Eclipse Temurin 22.0.1+8 release.
* Wed Mar 30 2024 Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> 22.0.0.0.0.36-0
- Eclipse Temurin 22+36 release 0.
* Wed Sep 18 2024 Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org> 23.0.0.0.0.37-0
- Eclipse Temurin 23+37 release 0.

0 comments on commit fe5ec62

Please sign in to comment.