public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Jiri Vanek <jvanek@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/java-latest-openjdk-portable] epel8: Merge branch 'epel10' into epel9
Date: Sun, 23 Aug 2026 06:06:03 GMT	[thread overview]
Message-ID: <178746516312.1.3295641756221243457.rpms-java-latest-openjdk-portable-4a33484b1ebd@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/java-latest-openjdk-portable
Branch : epel8
Commit : 4a33484b1ebd56e0bbe8ee812e9f54a50a2fd7e5
Author : Jiri Vanek <jvanek@redhat.com>
Date   : 2026-08-23T08:04:48+02:00
Stats  : +15/-12 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/java-latest-openjdk-portable/c/4a33484b1ebd56e0bbe8ee812e9f54a50a2fd7e5?branch=epel8

Log:
Merge branch 'epel10' into epel9

---
diff --git a/.gitignore b/.gitignore
index d9d346e..7a74a0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
 /openjdk-26.0.1+8.tar.xz
 /openjdk-26.0.2+10.tar.xz
 /openjdk-26.0.2.1+0.tar.xz
+/openjdk-27+35-ea.tar.xz

diff --git a/java-latest-openjdk-portable.spec b/java-latest-openjdk-portable.spec
index b46fce8..b74204c 100644
--- a/java-latest-openjdk-portable.spec
+++ b/java-latest-openjdk-portable.spec
@@ -1,9 +1,9 @@
 # New Version-String scheme-style defines
-%global featurever 26
+%global featurever 27
 %global interimver 0
-%global updatever 2
-%global patchver 1
-%global buildver        0
+%global updatever 0
+%global patchver 0
+%global buildver        35
 %global portablerelease 1
 %global rpmrelease 0
 
@@ -13,7 +13,6 @@
 %global fipsver 57722aab802
 # Define JDK versions
 %global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
-%global doczipver  %{featurever}.%{interimver}.%{updatever}
 %global javaver         %{featurever}
 # Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
 %global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
@@ -34,19 +33,21 @@
 # Release will be (where N is usually a number starting at 1):
 # - 0.N.ea<dist> for EA releases,
 # - N<dist> for GA releases
-%global is_ga           1
+%global is_ga           0
 %if %{is_ga}
 %global build_type GA
 %global ea_designator ""
 %global ea_designator_zip %{nil}
 %global extraver %{nil}
 %global eaprefix %{nil}
+%global doczipver  %{featurever}.%{interimver}.%{updatever}%{ea_designator_zip}
 %else
 %global build_type EA
 %global ea_designator ea
 %global ea_designator_zip -%{ea_designator}
 %global extraver .%{ea_designator}
 %global eaprefix 0.
+%global doczipver  %{featurever}-ea+%{buildver}
 %endif
 
 %global compatiblename  java-%{javaver}-%{origin}
@@ -304,7 +305,7 @@ URL:      http://openjdk.java.net/
 # other targets since this target is configured to use in-tree
 # AWT dependencies: lcms, libjpeg, libpng, libharfbuzz, giflib
 # and possibly others
-%global static_libs_target static-libs-graal-image
+%global static_libs_target static-libs-image
 %else
 %global static_libs_target %{nil}
 %endif
@@ -518,7 +519,7 @@ exit 1
 
 # images directories from upstream build
 %global jdkimage                jdk
-%global static_libs_image       static-libs-graal
+%global static_libs_image       static-libs
 # output dir stub
 # Parameterised macros are order-sensitive
 %define buildoutputdir() %{expand:build/jdk%{featurever}.build%{?1}}
@@ -1010,7 +1011,7 @@ if [ "x${UPSTREAM_EA_DESIGNATOR}" != "x%{ea_designator}" ] ; then
     echo "WARNING: Designator mismatch";
     echo "Spec file is configured for a %{build_type} build with designator '%{ea_designator}'"
     echo "Upstream version-pre setting is '${UPSTREAM_EA_DESIGNATOR}'";
-    exit 17
+    #exit 17
 fi
 
 # Systemtap is processed in rpms on fedoras and epels
@@ -1376,7 +1377,7 @@ function packagejdk() {
     if [ "x$suffix" = "x" ] ; then
       docname=%{docportablename}
       docarchive=${packagesdir}/%{docportablearchive}
-      built_doc_archive=jdk-%{doczipver}%{ea_designator_zip}-docs.zip
+      built_doc_archive=jdk-%{doczipver}-docs.zip
     fi
     # These are from the source tree so no debug variants
     miscname=%{miscportablename}
@@ -1428,6 +1429,7 @@ function packagejdk() {
     # Static libraries (needed for building graal vm with native image)
     # Tar as overlay. Transform to the JDK name, since we just want to "add"
     # static libraries to that folder
+    rm -vf "%{static_libs_image}"/lib/server/*jvm*
     createtar ${staticarchive} \
         --transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
     genchecksum ${staticarchive}

diff --git a/scripts/generate_source_tarball.sh b/scripts/generate_source_tarball.sh
index 7ce2806..23aef84 100755
--- a/scripts/generate_source_tarball.sh
+++ b/scripts/generate_source_tarball.sh
@@ -48,7 +48,7 @@
 # This will check out the same version as example 1, but from the
 # upstream repository:
 #
-# $ VERSION=jdk-26.0.2.1+0 PROJECT_NAME=openjdk REPO_NAME=jdk26u \
+# $ VERSION=jdk-27+35 PROJECT_NAME=openjdk REPO_NAME=jdk27u \
 #   BOOT_JDK=/usr/lib/jvm/java-latest-openjdk sh scripts/generate_source_tarball.sh
 #
 # Example 3:

diff --git a/sources b/sources
index 517748a..21fd9bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (openjdk-26.0.2.1+0.tar.xz) = a6d0e8c395c31019d70e768501c4c58d297440d9c297dd2b625382c1e14518d80ecd302484c0774cabe4ceca9280e6d91c6a88e8ada7c18efa11e773dda4d979
+SHA512 (openjdk-27+35-ea.tar.xz) = 887f2538e7e65ee5f4c2d3d7c0ebaa5d41c38341c9c1b3369128495e4c36d05178a7e12c2f312ac09ca2152374cfb68b5fa81fc0be03ebfe7243c32328d8bd38

             reply	other threads:[~2026-08-23  6:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-08-23  6:06 Jiri Vanek [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-08-19 17:48 [rpms/java-latest-openjdk-portable] epel8: Merge branch 'epel10' into epel9 Jiri Vanek
2026-07-24 16:25 Jiri Vanek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178746516312.1.3295641756221243457.rpms-java-latest-openjdk-portable-4a33484b1ebd@fedoraproject.org \
    --to=jvanek@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox