import osbuild-composer-109-1.el10

.osbuild-composer.metadata

-61c985ec69219162f2e155c5faf716b1ad1e2dc5921432fc70d8f551f94c96b1  SOURCES/osbuild-composer-108.tar.gz
+b5491caee53d594b5c5af8700e27d59514f4ed6d11c0add627a5b8afdc8899a9  SOURCES/osbuild-composer-109.tar.gz

SOURCES/PR-4186.patch

+From 1cc7757f85010539170ff99c5c6f00c75918a8ca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
+Date: Tue, 4 Jun 2024 14:52:05 +0200
+Subject: [PATCH] Tools/provision.sh: adjust conditional EPEL installation for
+ el10
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+EPEL-10 can't be installed on any of c10s and el10. Previously, the
+script would try to install EPEL repositories package on el10 and fail.
+
+In addition, use our "workaround" repository with c10s builds of some
+packages (such as koji) also on el10.
+
+Signed-off-by: Tomáš Hozza <thozza@redhat.com>
+---
+ tools/provision.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/provision.sh b/tools/provision.sh
+index 1c6eca8de..bab30fc99 100755
+--- a/tools/provision.sh
++++ b/tools/provision.sh
+@@ -31,14 +31,14 @@ fi
+ # and install koji and ansible here.
+ #
+ # TODO: Adjust the c10s condition, once EPEL-10 is available.
+-if [[ $ID == rhel || ($ID == centos && ${VERSION_ID%.*} -lt 10) ]] && ! rpm -q epel-release; then
++if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} -lt 10 ]] && ! rpm -q epel-release; then
+     curl -Ls --retry 5 --output /tmp/epel.rpm \
+         https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${VERSION_ID%.*}".noarch.rpm
+     sudo rpm -Uvh /tmp/epel.rpm
+ fi
+ 
+ # TODO: Remove this workaround, once koji is in EPEL-10
+-if [[ $ID == centos && ${VERSION_ID%.*} == 10 ]]; then
++if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
+     sudo dnf copr enable -y @osbuild/centpkg "centos-stream-10-$(uname -m)"
+ fi
+ 
+-- 
+2.45.1
+

SPECS/osbuild-composer.spec

@@ -12,7 +12,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        108
+Version:        109
 
 %gometa
 
@@ -36,6 +36,10 @@ License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
+# https://github.com/osbuild/osbuild-composer/pull/4179
+Patch0:         PR-4179.patch
+# https://github.com/osbuild/osbuild-composer/pull/4186
+Patch1:         PR-4186.patch
 
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
@@ -126,6 +130,10 @@ export GOPATH=%{gobuilddir}:%{gopath}
 
 TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
 
+%if 0%{?rhel}
+GOTAGS="${GOTAGS:+$GOTAGS,}rhel%{rhel}"
+%endif
+
 go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-composer-cli-tests %{goipath}/cmd/osbuild-composer-cli-tests
 go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-dnf-json-tests %{goipath}/cmd/osbuild-dnf-json-tests
 go test -c -tags="integration${GOTAGS:+,$GOTAGS}" -ldflags="${TEST_LDFLAGS}" -o _bin/osbuild-weldr-tests %{goipath}/internal/client/
@@ -147,28 +155,43 @@ 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
+# Latest CentOS supports building all CentOS versions
+%if 0%{?centos} >= 10
 install -m 0644 -vp repositories/centos-*                          %{buildroot}%{_datadir}/osbuild-composer/repositories/
+
 %else
-# CentOS 8 only supports building for CentOS 8
+# All other CentOS versions support building for the same version
 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/
 
+# CentOS 9 supports building also for CentOS 8
+%if 0%{?centos} == 9
+install -m 0644 -vp repositories/centos-8*                        %{buildroot}%{_datadir}/osbuild-composer/repositories/
+install -m 0644 -vp repositories/centos-stream-8*                 %{buildroot}%{_datadir}/osbuild-composer/repositories/
+%endif
+
 %endif
+
 %else
+
 %if 0%{?rhel}
-# RHEL 9 supports building for RHEL 8 and later
-%if 0%{?rhel} >= 9
+# RHEL 10 supports building all RHEL versions
+%if 0%{?rhel} >= 10
 install -m 0644 -vp repositories/rhel-*                            %{buildroot}%{_datadir}/osbuild-composer/repositories/
 
 %else
-# RHEL 8 only supports building for 8
+# All other RHEL versions support building for the same version
 install -m 0644 -vp repositories/rhel-%{rhel}*                     %{buildroot}%{_datadir}/osbuild-composer/repositories/
 
+# RHEL 9 supports building also for RHEL 8
+%if 0%{?rhel} == 9
+install -m 0644 -vp repositories/rhel-8*                           %{buildroot}%{_datadir}/osbuild-composer/repositories/
+%endif
+
 %endif
 %endif
 %endif
@@ -395,7 +418,11 @@ Requires:   httpd
 Requires:   mod_ssl
 Requires:   openssl
 Requires:   firewalld
+# podman-plugins has been deprecated since podman version 5.0.0,
+# which is in Fedora 40+ and in c10s / el10
+%if (0%{?rhel} && 0%{?rhel} < 10) || (0%{?fedora} && 0%{?fedora} < 40)
 Requires:   podman-plugins
+%endif
 Requires:   dnf-plugins-core
 Requires:   skopeo
 Requires:   make
@@ -422,6 +449,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Tue Jun 04 2024 Tomáš Hozza <thozza@redhat.com> - 109-1
+- New upstream release + bachport upstream fix to make tests pass on el10
+
+* Fri May 31 2024 Tomáš Hozza <thozza@redhat.com> - 108-2
+- Bachport upstream fixes to make tests pass
+
 * Fri May 17 2024 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 108-1
 - New upstream release