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

@@ -1,25 +0,0 @@
-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}.alma.1
+Release:        1%{?dist}
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -36,9 +36,6 @@ 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
@@ -150,12 +147,29 @@ 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}
 
-%if 0%{?almalinux}
+# CentOS 9 supports building for CentOS 8 and later
-%if 0%{?almalinux} >= 9
+%if 0%{?centos} >= 9
-install -m 0644 -vp repositories/almalinux-*                       %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %else
-install -m 0644 -vp repositories/almalinux-8*                      %{buildroot}%{_datadir}/osbuild-composer/repositories/
+# 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
 %endif
 
@@ -408,10 +422,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Mon Apr 30 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
 
@@ -442,6 +452,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Oct 04 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 91-1
 - New upstream release
 
+* Thu Sep 21 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 90-1
+- New upstream release
+
 * Wed Sep 06 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 89-1
 - New upstream release
 
@@ -472,8 +485,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Mar 08 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 77-1
 - New upstream release
 
-* Wed Mar 01 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 76-1
-- New upstream release
 * Wed Feb 22 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 75-1
 - New upstream release
 
@@ -498,9 +509,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Nov 16 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 68-1
 - New upstream release
 
-* Thu Nov 03 2022 Tomas Hozza <thozza@redhat.com> - 67-2
-- Fix functional tests to make them pass in RHEL-9.2 gating
-
 * Wed Nov 02 2022 imagebuilder-bots+imagebuilder-bot@redhat.com <imagebuilder-bot> - 67-1
 - New upstream release
 
@@ -510,13 +518,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Aug 24 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 60-1
 - New upstream release
 
-* Wed Aug 10 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
+* Thu Aug 11 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 59-1
 - New upstream release
 
 * Thu Jul 28 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 58-1
 - New upstream release
 
-* Wed Jul 13 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
+* Mon Jul 18 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 57-1
 - New upstream release
 
 * Wed Jun 15 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 55-1
@@ -525,139 +533,81 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 * Wed Jun 01 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 54-1
 - New upstream release
 
-* Fri May 20 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
+* Mon May 23 2022 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 53-1
 - New upstream release
 
 * Wed May 04 2022 Ondřej Budai <ondrej@budai.cz> - 51-1
 - New upstream release
 
-* Mon Feb 28 2022 Simon Steinbeiss <simon.steinbeiss@redhat.com> - 46-1
+* Tue Mar 01 2022 Ondřej Budai <ondrej@budai.cz> - 46-1
 - New upstream release
 
-* Fri Feb 18 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
+* Sat Feb 19 2022 Ondřej Budai <ondrej@budai.cz> - 45-1
 - New upstream release
 
-* Fri Feb 11 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
+* Mon Feb 14 2022 Thomas Lavocat <tlavocat@redhat.com> - 44-1
 - New upstream release
 
-* Wed Jan 26 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
+* Mon Feb 07 2022 Thomas Lavocat <tlavocat@redhat.com> - 43-1
 - New upstream release
 
-* Wed Jan 12 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
+* Tue Jan 18 2022 Thomas Lavocat <tlavocat@redhat.com> - 42-1
-- New upstream release
-
-* Wed Dec 22 2021 Ondřej Budai <ondrej@budai.cz> - 41-1
 - New upstream release
 
 * Thu Dec 09 2021 Ondřej Budai <ondrej@budai.cz> - 40-1
 - New upstream release
 
-* Wed Nov 24 2021 Chloe Kaubisch <chloe.kaubisch@gmail.com> - 39-1
+* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 37-1
 - New upstream release
 
-* Fri Nov 12 2021 'Diaa Sami' <'<disami@redhat.com>'> - 38-1
+* Fri Oct 15 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
-- New upstream release
-
-* Tue Nov 02 2021 lavocatt - 37-1
-- New upstream release
-
-* Thu Oct 14 2021 Achilleas Koutsou <achilleas@redhat.com> - 36-1
 - New upstream release
 
 * Mon Aug 30 2021 Tom Gundersen <teg@jklm.no> - 33-1
 - New upstream release
 
-* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-1
+* Sun Aug 29 2021 Tom Gundersen <teg@jklm.no> - 32-2
 - New upstream release
 
-* Sun Aug 15 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
+* Thu Aug 12 2021 Ondřej Budai <ondrej@budai.cz> - 31-1
-- New upstream release
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 30-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Jul 02 2021 Ondřej Budai <ondrej@budai.cz> - 30-1
-- New upstream release
-
-* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 29-3
-- Rebuilt for RHEL 9 BETA for openssl 3.0
-  Related: rhbz#1971065
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 29-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Fri Mar 05 2021 Martin Sehnoutka <msehnout@redhat.com> - 29-1
 - New upstream release
 
 * Sat Feb 20 2021 Martin Sehnoutka <msehnout@redhat.com> - 28-1
 - New upstream release
 
-* Thu Feb 04 2021 Ondrej Budai <obudai@redhat.com> - 27-1
+* Fri Feb 05 2021 Ondrej Budai <obudai@redhat.com> - 27-1
 - New upstream release
 
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-2
-- Fix the compatibility with a new golang-github-azure-storage-blob 0.12
-
 * Thu Dec 17 2020 Ondrej Budai <obudai@redhat.com> - 26-1
 - New upstream release
 
-* Thu Nov 19 2020 Ondrej Budai <obudai@redhat.com> - 25-1
+* Mon Nov 30 2020 Ondrej Budai <obudai@redhat.com> - 25-1
-- New upstream release
+- New upstream release 25 (rhbz#1883481)
 
-* Thu Nov 12 2020 Ondrej Budai <obudai@redhat.com> - 24-1
+* Thu Sep 03 2020 Tom Gundersen <tgunders@redhat.com> - 20.1-1
-- New upstream release
+- New upstream release 20.1 (rhbz#1872370)
 
-* Fri Nov 06 2020 Ondrej Budai <obudai@redhat.com> - 23-1
+* Sun Aug 23 2020 Tom Gundersen <tgunders@redhat.com> - 20-1
-- New upstream release
+- New upstream release 20 (rhbz#1871184 and rhbz#1871179)
 
-* Fri Oct 16 2020 Ondrej Budai <obudai@redhat.com> - 22-1
+* Thu Aug 13 2020 Tom Gundersen <tgunders@redhat.com> - 19-1
-- New upstream release
+- New upstream release 19 (rhbz#1866015 and rhbz#1866013)
 
-* Sun Aug 23 2020 Tom Gundersen <teg@jklm.no> - 20-1
+* Thu Jul 09 2020 Ondrej Budai <obudai@redhat.com> - 17-1
-- New upstream release
+- New upstream release 17 (rhbz#1831653)
-
+- Obsolete lorax-composer in favor of osbuild-composer (rhbz#1836844)
-* Tue Aug 11 2020 Tom Gundersen <teg@jklm.no> - 19-1
-- New upstream release
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 18-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 22 2020 Ondrej Budai <obudai@redhat.com> - 18-1
-- New upstream release
-
-* Wed Jul 08 2020 Ondrej Budai <obudai@redhat.com> - 17-1
-- New upstream release
 
 * Mon Jun 29 2020 Ondrej Budai <obudai@redhat.com> - 16-1
-- New upstream release
+- New upstream release 16 (rhbz#1831653)
 
 * Fri Jun 12 2020 Ondrej Budai <obudai@redhat.com> - 15-1
-- New upstream release
+- New upstream release 15 (rhbz#1831653)
 
 * Thu Jun 04 2020 Ondrej Budai <obudai@redhat.com> - 14-1
-- New upstream release
+- New upstream release 14 (rhbz#1831653)
-
-* Fri May 29 2020 Ondrej Budai <obudai@redhat.com> - 13-2
-- Add missing osbuild-ostree dependency
 
 * Thu May 28 2020 Ondrej Budai <obudai@redhat.com> - 13-1
-- New upstream release
+- New upstream release 13 (rhbz#1831653)
 
-* Thu May 14 2020 Ondrej Budai <obudai@redhat.com> - 12-1
+* Tue May 05 2020 Ondrej Budai <obudai@redhat.com> - 11-1
-- New upstream release
+- Initial package (renamed from golang-github-osbuild-composer) (rhbz#1771887)
-
-* Wed Apr 29 2020 Ondrej Budai <obudai@redhat.com> - 11-1
-- New upstream release
-
-* Wed Apr 15 2020 Ondrej Budai <obudai@redhat.com> - 10-1
-- New upstream release
-
-* Wed Apr 01 2020 Ondrej Budai <obudai@redhat.com> - 9-1
-- New upstream release
-
-* Mon Mar 23 2020 Ondrej Budai <obudai@redhat.com> - 8-1
-- Initial package (renamed from golang-github-osbuild-composer)