.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-101.tar.gz
+SOURCES/osbuild-composer-100.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-0feb86b5dcd146ce5b87816ae482eb50ed507c16 SOURCES/osbuild-composer-101.tar.gz
+ee2bb2068e42599ca6ef66499d00077ee06b3b44 SOURCES/osbuild-composer-100.tar.gz

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

@@ -7,12 +7,9 @@
 # This is used internally during nightly pipeline testing!
 %bcond_with relax_requires
 
-# The minimum required osbuild version
-%global min_osbuild_version 109
-
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        101
+Version:        100
 
 %gometa
 
@@ -25,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
@@ -36,6 +33,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
@@ -106,8 +105,6 @@ export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/comm
 
 %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
 %gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker
-%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-manager %{goipath}/cmd/osbuild-jobsite-manager
-%gobuild ${GOTAGS:+-tags=$GOTAGS} -o _bin/osbuild-jobsite-builder %{goipath}/cmd/osbuild-jobsite-builder
 
 make man
 
@@ -142,34 +139,15 @@ go build -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _b
 install -m 0755 -vd                                                %{buildroot}%{_libexecdir}/osbuild-composer
 install -m 0755 -vp _bin/osbuild-composer                          %{buildroot}%{_libexecdir}/osbuild-composer/
 install -m 0755 -vp _bin/osbuild-worker                            %{buildroot}%{_libexecdir}/osbuild-composer/
-install -m 0755 -vp _bin/osbuild-jobsite-manager                   %{buildroot}%{_libexecdir}/osbuild-composer/
+install -m 0755 -vp dnf-json                                       %{buildroot}%{_libexecdir}/osbuild-composer/
-install -m 0755 -vp _bin/osbuild-jobsite-builder                   %{buildroot}%{_libexecdir}/osbuild-composer/
 
 # 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%{?almalinux}
-%if 0%{?centos}
+%if 0%{?almalinux} >= 9
-
+install -m 0644 -vp repositories/almalinux-*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
-# CentOS 9 supports building for CentOS 8 and later
-%if 0%{?centos} >= 9
-install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
 %else
-# CentOS 8 only supports building for CentOS 8
+install -m 0644 -vp repositories/almalinux-8*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
-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
 
@@ -300,9 +278,7 @@ cd $PWD/_build/src/%{goipath}
 
 %package core
 Summary:    The core osbuild-composer binary
-Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Requires:   %{name}-dnf-json = %{version}-%{release}
-Provides:   %{name}-dnf-json = %{version}-%{release}
-Obsoletes:  %{name}-dnf-json < %{version}-%{release}
 
 %description core
 The core osbuild-composer binary. This is suitable both for spawning in containers and by systemd.
@@ -315,21 +291,17 @@ The core osbuild-composer binary. This is suitable both for spawning in containe
 Summary:    The worker for osbuild-composer
 Requires:   systemd
 Requires:   qemu-img
-Requires:   osbuild >= %{min_osbuild_version}
+Requires:   osbuild >= 98
-Requires:   osbuild-ostree >= %{min_osbuild_version}
+Requires:   osbuild-ostree >= 98
-Requires:   osbuild-lvm2 >= %{min_osbuild_version}
+Requires:   osbuild-lvm2 >= 98
-Requires:   osbuild-luks2 >= %{min_osbuild_version}
+Requires:   osbuild-luks2 >= 98
-Requires:   osbuild-depsolve-dnf >= %{min_osbuild_version}
+Requires:   %{name}-dnf-json = %{version}-%{release}
-Provides:   %{name}-dnf-json = %{version}-%{release}
-Obsoletes:  %{name}-dnf-json < %{version}-%{release}
 
 %description worker
 The worker for osbuild-composer
 
 %files worker
 %{_libexecdir}/osbuild-composer/osbuild-worker
-%{_libexecdir}/osbuild-composer/osbuild-jobsite-manager
-%{_libexecdir}/osbuild-composer/osbuild-jobsite-builder
 %{_unitdir}/osbuild-worker@.service
 %{_unitdir}/osbuild-remote-worker@.service
 
@@ -351,6 +323,25 @@ fi
 # restart all the worker services
 %systemd_postun_with_restart "osbuild-worker@*.service" "osbuild-remote-worker@*.service"
 
+%package dnf-json
+Summary: The dnf-json binary used by osbuild-composer and the workers
+
+# Conflicts with older versions of composer that provide the same files
+# this can be removed when RHEL 8 reaches EOL
+Conflicts: osbuild-composer <= 35
+
+%description dnf-json
+The dnf-json binary used by osbuild-composer and the workers.
+
+%files dnf-json
+%{_libexecdir}/osbuild-composer/dnf-json
+
+%post dnf-json
+# Fix ownership of the rpmmd cache files from previous versions where it was owned by root:root
+if [ -e /var/cache/osbuild-composer/rpmmd ]; then
+    chown -f -R --from root:root _osbuild-composer:_osbuild-composer /var/cache/osbuild-composer/rpmmd
+fi
+
 %if %{with tests} || 0%{?rhel}
 
 %package tests
@@ -422,12 +413,13 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Mon Feb 26 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 101-1
+* Wed Mar 27 2024 Eduard Abdullin <eabdullin@almalinux.org> - 100-1.alma
-- New upstream release
+- Install AlmaLinux repositories
+- Add AlmaLinux support patch (Thanks @pastalian)
+- Remove libreport-rhel-bugzilla from package set
 
 * Wed Feb 07 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 100-1
 - New upstream release
-
 * Wed Jan 24 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 99-1
 - New upstream release
 
@@ -460,7 +452,6 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 
 * Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
 - New upstream release
-
 * Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
 - New upstream release