Add AlmaLinux repositories

SOURCES/0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch

@@ -1,46 +0,0 @@
-From db14fa981a84d23b9851d1112d941409124ed868 Mon Sep 17 00:00:00 2001
-From: eabdullin <eabdullin@almalinux.org>
-Date: Fri, 14 Nov 2025 10:25:12 +0300
-Subject: [PATCH] Bring AlmaLinux-9 and AlmaLinux-8 to distros back
-
----
- .../osbuild/images/data/distrodefs/distros.yaml  | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
-index f1d3dab..ff91232 100644
---- a/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
-+++ b/vendor/github.com/osbuild/images/data/distrodefs/distros.yaml
-@@ -236,6 +236,14 @@ distros:
-       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
-       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
- 
-+  - <<: *rhel9
-+    name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
-+    match: 'almalinux-9\.[0-9]{1,2}'
-+    product: "AlmaLinux"
-+    vendor: "almalinux"
-+    ostree_ref_tmpl: "almalinux/9/%%s/edge"
-+    iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd"
-+
-   - &centos9
-     <<: *rhel9
-     name: centos-9
-@@ -325,6 +333,14 @@ distros:
-       ppc64le: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
-       s390x: "registry.access.redhat.com/ubi{{.MajorVersion}}/ubi:latest"
- 
-+  - <<: *rhel8
-+    name: "almalinux-{{.MajorVersion}}.{{.MinorVersion}}"
-+    match: 'almalinux-8\.[0-9]{1,2}'
-+    product: "AlmaLinux"
-+    vendor: "almalinux"
-+    ostree_ref_tmpl: "almalinux/8/%%s/edge"
-+    iso_label_tmpl: "AlmaLinux-{{.Distro.MajorVersion}}-{{.Distro.MinorVersion}}-{{.Arch}}-dvd"
-+
-   - &centos8
-     <<: *rhel8
-     name: centos-8
--- 
-2.51.0
-

SPECS/osbuild-composer.spec

@@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        1%{?dist}.alma.3
+Release:        1%{?dist}.alma.1
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -36,10 +36,6 @@ License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
-# AlmaLinux Patch
-Patch1: 0001-Backport-https-github.com-osbuild-images-pull-1926.patch
-Patch2: 0001-Bring-AlmaLinux-9-and-AlmaLinux-8-to-distros-back.patch
-
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -450,7 +446,7 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Tue Apr 21 2026 Eduard Abdullin <eabdullin@almalinux.org> - 164-1.alma.3
+* Tue Apr 21 2026 Eduard Abdullin <eabdullin@almalinux.org> - 164-1.alma.1
 - Add AlmaLinux repositories
 
 * Mon Feb 23 2026 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 164-1