Merge branch 'c8' into a8

- Add new key for AlmaLinux8

SOURCES/0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch

@@ -0,0 +1,25 @@
+From a4435c48480b969785d9afbec7ad3657db24f43b Mon Sep 17 00:00:00 2001
+From: eabdullin <ed.abdullin.1@gmail.com>
+Date: Thu, 28 Mar 2024 13:12:22 +0300
+Subject: [PATCH] Remove libreport-rhel-anaconda-bugzilla from anaconda
+ packageset
+
+---
+ vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
+index 05c54e5..68b0100 100644
+--- a/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
++++ b/vendor/github.com/osbuild/images/pkg/distro/rhel8/bare_metal.go
+@@ -214,7 +214,6 @@ func anacondaPackageSet(t *imageType) rpmmd.PackageSet {
+ 			"libibverbs",
+ 			"libreport-plugin-bugzilla",
+ 			"libreport-plugin-reportuploader",
+-			"libreport-rhel-anaconda-bugzilla",
+ 			"librsvg2",
+ 			"linux-firmware",
+ 			"lklug-fonts",
+-- 
+2.39.3 (Apple Git-146)
+

SPECS/osbuild-composer.spec

@@ -25,7 +25,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        1%{?dist}
+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,6 +36,8 @@ License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
+Patch100:       0001-AlmaLinux-support-patch.patch
+Patch101:       0001-Remove-libreport-rhel-anaconda-bugzilla-from-anacond.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -147,29 +149,11 @@ install -m 0755 -vp _bin/osbuild-jobsite-builder                   %{buildroot}%
 
 # Only include repositories for the distribution and release
 install -m 0755 -vd                                                %{buildroot}%{_datadir}/osbuild-composer/repositories
-# CentOS also defines rhel so we check for centos first
-%if 0%{?centos}
-
-# CentOS 9 supports building for CentOS 8 and later
-%if 0%{?centos} >= 9
-install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+%if 0%{?almalinux}
+%if 0%{?almalinux} >= 9
+install -m 0644 -vp repositories/almalinux-*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %else
-# CentOS 8 only supports building for CentOS 8
-install -m 0644 -vp repositories/centos-%{centos}*                 %{buildroot}%{_datadir}/osbuild-composer/repositories/
-install -m 0644 -vp repositories/centos-stream-%{centos}*          %{buildroot}%{_datadir}/osbuild-composer/repositories/
-
-%endif
-%else
-%if 0%{?rhel}
-# RHEL 9 supports building for RHEL 8 and later
-%if 0%{?rhel} >= 9
-install -m 0644 -vp repositories/rhel-*                            %{buildroot}%{_datadir}/osbuild-composer/repositories/
-
-%else
-# RHEL 8 only supports building for 8
-install -m 0644 -vp repositories/rhel-%{rhel}*                     %{buildroot}%{_datadir}/osbuild-composer/repositories/
-
-%endif
+install -m 0644 -vp repositories/almalinux-8*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %endif
 %endif
 
@@ -422,6 +406,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Wed May 22 2024 Eduard Abdullin <eabdullin@almalinux.org> - 101-1.alma.1
+- Install AlmaLinux repositories
+- Add AlmaLinux support
+
 * Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
 - New upstream release