From df7d201f483b38d98e565e543b4dea05fc852501 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-30-22-119.ec2.internal>
Date: Thu, 23 Jul 2026 03:37:59 +0000
Subject: [PATCH 1/2] fix(autopatch): auto-fix for java-21-openjdk on c9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed obsolete replace action for portablesuffix — the upstream spec refactor now naturally produces el8 for AlmaLinux builds.
---
 config.yaml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/config.yaml b/config.yaml
index 7837a67..ca18ebc 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,19 +1,4 @@
 actions:
-  - replace:
-      - target: "spec"
-        find: |
-              %global portablesuffix el9
-              %endif
-        replace: |
-              %global portablesuffix el9
-              %endif
-              
-              %if 0%{?almalinux}
-              %global portablesuffix el8
-              %endif
-
-        count: 1
-
   - modify_release:
     - suffix: ".alma.1"
       enabled: true

From 61d5a9e8c8d52a034ecc675517fb628b78577ec0 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 23 Jul 2026 10:34:29 +0300
Subject: [PATCH 2/2] fix(autopatch): restore AlmaLinux el8 portablesuffix
 override
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

almalinux-release defines the %centos macro (%centos %{major}), so the
upstream spec's `%if 0%{?centos} == 0` test treats AlmaLinux as CentOS
and sets portablesuffix to el9. AlmaLinux must consume the el8 portable
packages (like RHEL), so the previous action was NOT obsolete — dropping
it left the "Set portablesuffix to el8" changelog with nothing setting it.

Re-add the `%if 0%{?almalinux}` -> el8 override, anchored on the stable
`%global portablebuilddir /builddir/build/BUILD` line (matching the a10s
and a10 branch configs) instead of the fragile portablesuffix/%endif anchor.
---
 config.yaml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/config.yaml b/config.yaml
index ca18ebc..d5b572d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,4 +1,15 @@
 actions:
+  - replace:
+      - target: "spec"
+        find: "%global portablebuilddir /builddir/build/BUILD"
+        replace: |
+              %global portablebuilddir /builddir/build/BUILD
+
+              %if 0%{?almalinux}
+              %global portablesuffix el8
+              %endif
+        count: 1
+
   - modify_release:
     - suffix: ".alma.1"
       enabled: true