From b523f6cd54d66d201f0b5d8622d6df1480238e94 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 17 Oct 2022 14:06:00 +0300 Subject: [PATCH] Modify spec --- SPECS/osbuild-composer.spec | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 0ecb564..c64863f 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients. } Name: osbuild-composer -Release: 1%{?dist} +Release: 1%{?dist}.alma Summary: An image building service based on osbuild # osbuild-composer doesn't have support for building i686 and armv7hl images @@ -33,6 +33,8 @@ License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +Patch100: almalinux_support.patch + BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: systemd @@ -139,30 +141,12 @@ install -m 0755 -vp dnf-json %{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-* %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 -%endif +install -m 0644 -vp repositories/almalinux-8* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif # Fedora can build for all included fedora releases @@ -424,6 +408,10 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog +* Mon Oct 17 2022 Eduard Abdullin - 60-1.alma +- Install AlmaLinux repositories +- Add AlmaLinux support + * Wed Aug 24 2022 imagebuilder-bot - 60-1 - New upstream release