From e61553bf7e72658895c3098210a41d7f7bae50cf Mon Sep 17 00:00:00 2001
From: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com>
Date: Thu, 3 Apr 2025 14:34:16 +0000
Subject: [PATCH 1/2] Update to 137

Resolves: RHEL-74263
---
 .gitignore            |  1 +
 osbuild-composer.spec | 22 ++++++++--------------
 sources               |  2 +-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index a75cf31..cd09ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,4 @@
 /osbuild-composer-134.tar.gz
 /osbuild-composer-135.tar.gz
 /osbuild-composer-136.tar.gz
+/osbuild-composer-137.tar.gz
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 50bd80a..17c6e90 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -8,11 +8,11 @@
 %bcond_with relax_requires
 
 # The minimum required osbuild version
-%global min_osbuild_version 139
+%global min_osbuild_version 142
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        136
+Version:        137
 
 %gometa
 
@@ -116,13 +116,6 @@ make man
 # Build test binaries with `go test -c`, so that they can take advantage of
 # golang's testing package. The golang rpm macros don't support building them
 # directly. Thus, do it manually, taking care to also include a build id.
-#
-# On Fedora, also turn off go modules and set the path to the one into which
-# the golang-* packages install source code.
-%if 0%{?fedora}
-export GO111MODULE=off
-export GOPATH=%{gobuilddir}:%{gopath}
-%endif
 
 TEST_LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
 
@@ -292,14 +285,12 @@ install -m 0644 -vp test/data/rhel-upgrade/*                       %{buildroot}%
 %check
 export GOFLAGS="-buildmode=pie"
 %if 0%{?rhel}
-export GOFLAGS+=" -mod=vendor -tags=exclude_graphdriver_btrfs"
+export GOFLAGS+=" -tags=exclude_graphdriver_btrfs"
+%endif
+
 export GOPATH=$PWD/_build:%{gopath}
 # cd inside GOPATH, otherwise go with GO111MODULE=off ignores vendor directory
 cd $PWD/_build/src/%{goipath}
-%gotest ./...
-%else
-%gocheck
-%endif
 
 %post
 %systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-composer-prometheus.socket osbuild-remote-worker.socket
@@ -454,6 +445,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Thu Apr 03 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 137-1
+- New upstream release
+
 * Mon Mar 31 2025 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 136-1
 - New upstream release
 
diff --git a/sources b/sources
index 9fc671d..71c4964 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (osbuild-composer-136.tar.gz) = 100f36779fbb02f2b00b5c78e89a8a2307957be5f5d04da721168b8e51a96408034564f1f4239449ef23d7df8d710e55bbada998c5bfe15d1cbd14dd23a515a2
+SHA512 (osbuild-composer-137.tar.gz) = e26cf40aed1ffd67741fc13585973bd70cd987bc1243ce7c6e77214b3dd187e50f9b4e1bb28673eed59f46a5c27098787ea73e4fe06a5c53dd475bc2c28165f1

From 61f524fc07397ef0e0d785a9f0ae205b6c899bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
Date: Mon, 7 Apr 2025 14:16:39 +0200
Subject: [PATCH 2/2] Test/unit-tests: handle dot releases when parsing Source0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tomáš Hozza <thozza@redhat.com>
---
 tests/unit-tests/run-unit-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit-tests/run-unit-tests.sh b/tests/unit-tests/run-unit-tests.sh
index ea59569..f6487a4 100755
--- a/tests/unit-tests/run-unit-tests.sh
+++ b/tests/unit-tests/run-unit-tests.sh
@@ -16,7 +16,7 @@ sudo dnf builddep -y osbuild-composer.spec
 cd "${TMT_SOURCE_DIR}"
 
 # Extract the Source0 basename without extension
-SRC_DIR=$(spectool --source 0 osbuild-composer.spec | sed 's/.\+\(osbuild-composer-[0-9]\+\)\.tar\.gz/\1/')
+SRC_DIR=$(spectool --source 0 osbuild-composer.spec | sed -E 's|.*/([^/]*)\.tar\.gz$|\1|')
 
 # Move to the extracted sources directory (patches are applied by default)
 cd "${SRC_DIR}"