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 - 137-1 +- New upstream release + * Mon Mar 31 2025 imagebuilder-bot - 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