From eb8546165b008d4087dbd9afada26d82cc29118a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 20:52:34 +0000
Subject: [PATCH 01/33] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 59ec9c9..4c94b97 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -5,7 +5,7 @@
 
 Name:      weldr-client
 Version:   35.1
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -121,6 +121,9 @@ composer-cli package.
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 35.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Apr 22 2021 Brian C. Lane <bcl@redhat.com> - 35.1-2
 - Obsolete composer-cli < 35.0 instead of 34.0
   Patch until next upstream release

From e9f328afba293d9403ac37c704ecbfe2047388bf Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 23 Aug 2021 12:09:53 -0700
Subject: [PATCH 02/33] - weldr: Use assert.Contains instead of IsStringInSlice
 (bcl) - Add missing projects depsolve command (bcl) - Add support for
 projects info --distro=DISTRO-NAME (bcl) - Add support for projects list
 --distro=DISTRO-NAME (bcl) - Add support for modules info
 --distro=DISTRO-NAME (bcl) - weldr: Add distros to testState (bcl) - Add
 support for modules list --distro=DISTRO-NAME (bcl) - weldr: Add AppendQuery
 helper function (bcl) - Add support for compose types --distro=DISTRO-NAME
 (bcl) - composer-cli: Add distros list command (bcl) - weldr: Add ListDistros
 function and tests (bcl) - Makefile: Add scratch-srpm and scratch-rpm targets
 (bcl) - Print filename for compose results (bcl) - ExcuteTests - return the
 correct error variables in case of errors (atodorov) - The rpm package should
 obsolete composer-cli from lorax (bcl) - tests: Enable CodeCov.io (atodorov)
 - actions: Install lint using GOPATH (bcl)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 53 ++++++++++++++++++++++++-----------------------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c87b13..0074695 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /gpg-117E8C168EFE3A7F.key
 /weldr-client-35.1.tar.gz
+/weldr-client-35.2.tar.gz
+/weldr-client-35.2.tar.gz.asc
diff --git a/sources b/sources
index b219810..0cadb17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (gpg-117E8C168EFE3A7F.key) = 36712a4e05cbb2ca139e777d8b2abe4ee0536f970208c2c2c1a50a2294979b828a9d6abcbad1dce3cc015a0c4364ab87ab04cb459811ad3aca5cf6611093b9bd
-SHA512 (weldr-client-35.1.tar.gz) = 8508b446c44eae917710083c8185054e3a89f799723b71e2d0069ce35c653ea2adabcab3b8d7d9a903f127798368933ba765c603ebed4fe3f6c6187c032a793c
+SHA512 (weldr-client-35.2.tar.gz) = 15be056982683b9b8d5485ff9aa48dff237a48c3ee9d104c0de16898653facb0a63371a8d31bdf3fb19034022411c8d77e2358b22de52d23768cc7363f4926de
+SHA512 (weldr-client-35.2.tar.gz.asc) = 7aabc7faaedc8c1d87a7b182348aa11a52db8425c7327fe52c560d2a861643e27f6d53628d4261027b092198003f02f12ad3ccb98f8f4ce8ce9e1f39fd67b556
diff --git a/weldr-client.spec b/weldr-client.spec
index 4c94b97..064b2d7 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -1,18 +1,22 @@
 # Pass --with tests to rpmbuild to build composer-cli-tests
 %bcond_with tests
+# Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION)
+%bcond_without signed
 
 %global goipath         github.com/osbuild/weldr-client
 
 Name:      weldr-client
-Version:   35.1
-Release:   3%{?dist}
+Version:   35.2
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
 Url:       %{gourl}
 Source0:   https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz
+%if %{with signed}
 Source1:   https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key
+%endif
 
 Obsoletes: composer-cli < 35.0
 Provides: composer-cli = %{version}-%{release}
@@ -37,7 +41,9 @@ BuildRequires: gnupg2
 Command line utility to control osbuild-composer
 
 %prep
+%if %{with signed}
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%endif
 %if 0%{?rhel}
 %forgeautosetup -p1
 %else
@@ -121,27 +127,22 @@ composer-cli package.
 
 
 %changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 35.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 22 2021 Brian C. Lane <bcl@redhat.com> - 35.1-2
-- Obsolete composer-cli < 35.0 instead of 34.0
-  Patch until next upstream release
-
-* Mon Apr 12 2021 Brian C. Lane <bcl@redhat.com> - 35.1-1
-- New release: 35.1 (bcl)
-- spec: Change release back to 1 (bcl)
-- spec: Move testify BuildRequires into fedora block (bcl)
-- vendor: Add vendored dependencies for RHEL (bcl)
-- tools: Add prepare-source.sh vendoring helper script (bcl)
-- Makefile: skip vendor directory for check target (bcl)
-- spec: Bump release to 2 (bcl)
-- spec: Fix BuildRequires for tests (bcl)
-- Makefile: Remove executable from bash completion (bcl)
-- Makefile: Only use GOBUILDFLAGS (bcl)
-- spec: Bump release to 2 (bcl)
-- spec: Add doc files (bcl)
-- spec: Add gpg signature verification (bcl)
-- spec: Use git-core instead of git (bcl)
-- spec: Set License to Apache 2.0 (bcl)
-- spec: Update Source urls with new project location (bcl)
+* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-1
+- New release: 35.2 (bcl)
+- weldr: Use assert.Contains instead of IsStringInSlice (bcl)
+- Add missing projects depsolve command (bcl)
+- Add support for projects info --distro=DISTRO-NAME (bcl)
+- Add support for projects list --distro=DISTRO-NAME (bcl)
+- Add support for modules info --distro=DISTRO-NAME (bcl)
+- weldr: Add distros to testState (bcl)
+- Add support for modules list --distro=DISTRO-NAME (bcl)
+- weldr: Add AppendQuery helper function (bcl)
+- Add support for compose types --distro=DISTRO-NAME (bcl)
+- composer-cli: Add distros list command (bcl)
+- weldr: Add ListDistros function and tests (bcl)
+- Makefile: Add scratch-srpm and scratch-rpm targets (bcl)
+- Print filename for compose results (bcl)
+- ExcuteTests - return the correct error variables in case of errors (atodorov)
+- The rpm package should obsolete composer-cli from lorax (bcl)
+- tests: Enable CodeCov.io (atodorov)
+- actions: Install lint using GOPATH (bcl)
\ No newline at end of file

From 2df426b6a22f15d011685921ae08ac2adf9c45d3 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 23 Aug 2021 12:28:47 -0700
Subject: [PATCH 03/33] - Fix sources to include key and signature

---
 sources                      |  1 +
 weldr-client-35.1.tar.gz.asc | 11 -----------
 weldr-client.spec            |  7 +++++--
 3 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 weldr-client-35.1.tar.gz.asc

diff --git a/sources b/sources
index 0cadb17..733d5d2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (weldr-client-35.2.tar.gz) = 15be056982683b9b8d5485ff9aa48dff237a48c3ee9d104c0de16898653facb0a63371a8d31bdf3fb19034022411c8d77e2358b22de52d23768cc7363f4926de
 SHA512 (weldr-client-35.2.tar.gz.asc) = 7aabc7faaedc8c1d87a7b182348aa11a52db8425c7327fe52c560d2a861643e27f6d53628d4261027b092198003f02f12ad3ccb98f8f4ce8ce9e1f39fd67b556
+SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client-35.1.tar.gz.asc b/weldr-client-35.1.tar.gz.asc
deleted file mode 100644
index df7d102..0000000
--- a/weldr-client-35.1.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEtMa0UeT6i0IyyhkeEX6MFo7+On8FAmB0v1oACgkQEX6MFo7+
-On/fBQgAheXV7RRzQEKiYTc53dNKY2+jTzy++W2BpBnpMVIkcu8LjSLQ9sD2AF5o
-90aeeTnMs4o2YKjInj2Rl/TfnA0JfHl+es/QcpKwM6Tl7Znn9570hRy10JuRojSe
-4Lq8wxcr8m5oxAzE1UAvz4ws0xdgHwvhPJJUfMNXANj5BX7M/5A3493zDAkwvQ9H
-3VdPenPgZk2nwjml0IgtTR+sRn1aJC0yXYtcP2bAlOV3sAklVkIGhL3E9bh78Bbj
-oRCN50Bw3jrFmhisfT1HhKtW0B64mg12uIXAqi0S471O4eiy4cF6SFh9L5bSqaTZ
-Zw1nTyzykUR0DCtQ6n/Vcqo7jl8Fsw==
-=YWa+
------END PGP SIGNATURE-----
diff --git a/weldr-client.spec b/weldr-client.spec
index 064b2d7..a6c08de 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -127,6 +127,9 @@ composer-cli package.
 
 
 %changelog
+* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-2
+- Fix sources to include key and signature
+
 * Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-1
 - New release: 35.2 (bcl)
 - weldr: Use assert.Contains instead of IsStringInSlice (bcl)
@@ -145,4 +148,4 @@ composer-cli package.
 - ExcuteTests - return the correct error variables in case of errors (atodorov)
 - The rpm package should obsolete composer-cli from lorax (bcl)
 - tests: Enable CodeCov.io (atodorov)
-- actions: Install lint using GOPATH (bcl)
\ No newline at end of file
+- actions: Install lint using GOPATH (bcl)

From 8bd25cf9872795eb0a99fa453ad4525fe25a2be6 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 4 Oct 2021 14:34:04 -0700
Subject: [PATCH 04/33] - New release: 35.3 (bcl) - spec: Adjust build methods
 for RHEL 8 (bcl) - github: Run build-in-podman to test building package (bcl)
 - spec: Use v2 module (bcl) - Makefile: Use v2 module (bcl) - Makefile: Add a
 build-in-podman target (bcl) - tests: Add JSON and error result testing to
 status (bcl) - tests: Add JSON and error result testing to sources (bcl) -
 tests: Add JSON and error result testing to projects (bcl) - tests: Add JSON
 and error result testing to modules (bcl) - tests: Add JSON and error result
 testing to distros (bcl) - tests: Add JSON and error result testing to
 compose (bcl) - tests: Add JSON and error result testing to blueprints (bcl)
 - test: Fix test client setup and output capture code (bcl) - test: Close
 output capture in printwrap_test (bcl) - test: reset the root flags on every
 ExecuteTest call (bcl) - status: Use ExecutionErrors for API errors (bcl) -
 sources: Use ExecutionErrors for API errors (bcl) - projects: Use
 ExecutionErrors for API errors (bcl) - modules: Use ExecutionErrors for API
 errors (bcl) - distros: Use ExecutionErrors for API errors (bcl) - compose:
 Use ExecutionErrors for API errors (bcl) - blueprints: Use ExecutionErrors
 for API errors (bcl) - composer-cli: Turn off normal command Stdout when
 --json is used (bcl) - weldr: Fix Stringer interface on API messages (bcl) -
 weldr: Clean up error message return code (bcl) - weldr: Move Unmarshal error
 to error position (bcl) - root: Add a helper function to print a list of
 errors (bcl) - Use GetFilePath for ComposeImage (bcl) - Use GetFilePath for
 ComposeResults (bcl) - Use GetFilePath for ComposerMetadata (bcl) - Use
 GetFilePath for ComposeLogs (bcl) - weldr: Add GetFilePath to download a file
 to a path (bcl) - Creating v2 module for breaking API changes (bcl) -
 Makefile: Add update-mods target (bcl) - vendor: Update the modules and
 vendor directory (bcl) - Bump go version to 1.15 (bcl) - Limit dependabot to
 1 PR (bcl) - Enable Dependabot service (atodorov) - tests: Fix integration
 tests (bcl)

---
 .gitignore        |  2 +
 sources           |  4 +-
 weldr-client.spec | 97 +++++++++++++++++++++++++++++------------------
 3 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0074695..c9f53a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 /weldr-client-35.1.tar.gz
 /weldr-client-35.2.tar.gz
 /weldr-client-35.2.tar.gz.asc
+/weldr-client-35.3.tar.gz
+/weldr-client-35.3.tar.gz.asc
diff --git a/sources b/sources
index 733d5d2..d76c351 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.2.tar.gz) = 15be056982683b9b8d5485ff9aa48dff237a48c3ee9d104c0de16898653facb0a63371a8d31bdf3fb19034022411c8d77e2358b22de52d23768cc7363f4926de
-SHA512 (weldr-client-35.2.tar.gz.asc) = 7aabc7faaedc8c1d87a7b182348aa11a52db8425c7327fe52c560d2a861643e27f6d53628d4261027b092198003f02f12ad3ccb98f8f4ce8ce9e1f39fd67b556
+SHA512 (weldr-client-35.3.tar.gz) = 1f2a79598dbd6d757a3c5ed26434f945659e0ee047a6f241f032325e19688f9722cbbb7e968e0858aa6d276b6d0013ef551b2957fda7b3f68c521a05e9e45ad7
+SHA512 (weldr-client-35.3.tar.gz.asc) = 257c806de93fe83e2bb305af97dd1e3676b83916b67cb5ce7d9ba7131084226bbfa0900ca6647464be6ad88ec2554561b86c4acab01f64b20e6ec61591b08747
 SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client.spec b/weldr-client.spec
index a6c08de..0e6f25f 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -3,11 +3,11 @@
 # Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION)
 %bcond_without signed
 
-%global goipath         github.com/osbuild/weldr-client
+%global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.2
-Release:   2%{?dist}
+Version:   35.3
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -51,6 +51,8 @@ Command line utility to control osbuild-composer
 %endif
 
 %build
+export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} "
+
 %if 0%{?rhel}
 GO_BUILD_PATH=$PWD/_build
 install -m 0755 -vd $(dirname $GO_BUILD_PATH/src/%{goipath})
@@ -60,33 +62,33 @@ install -m 0755 -vd _bin
 export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
 export GOFLAGS=-mod=vendor
+%gobuild -o composer-cli %{goipath}/cmd/composer-cli
 %else
 export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
 export GO111MODULE=off
+make GOBUILDFLAGS="%{gobuildflags}" build
 %endif
 
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-make GOBUILDFLAGS="%{gobuildflags}" build
 
 ## TODO
 ##make man
 
 %if %{with tests} || 0%{?rhel}
+export BUILDTAGS="integration"
+
 # 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
+# golang's testing package. The RHEL 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 GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
-export GO111MODULE=off
-%endif
-
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-export BUILDTAGS="integration"
+%if 0%{?rhel}
+export LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+go test -c -tags=integration -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
+%else
 make GOBUILDFLAGS="%{gobuildflags}" integration
 %endif
+%endif
 
 %install
 make DESTDIR=%{buildroot} install
@@ -101,8 +103,10 @@ export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
 export GO111MODULE=off
 %endif
 
-export LDFLAGS="-X github.com/osbuild/weldr-client/cmd/composer-cli/root.Version=%{version} "
-make GOBUILDFLAGS="%{gotestflags}" test
+# Run the unit tests
+export LDFLAGS="-X %{goipath}/cmd/composer-cli/root.Version=%{version} "
+make test
+
 
 %files
 %license LICENSE
@@ -127,25 +131,44 @@ composer-cli package.
 
 
 %changelog
-* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-2
-- Fix sources to include key and signature
-
-* Mon Aug 23 2021 Brian C. Lane <bcl@redhat.com> - 35.2-1
-- New release: 35.2 (bcl)
-- weldr: Use assert.Contains instead of IsStringInSlice (bcl)
-- Add missing projects depsolve command (bcl)
-- Add support for projects info --distro=DISTRO-NAME (bcl)
-- Add support for projects list --distro=DISTRO-NAME (bcl)
-- Add support for modules info --distro=DISTRO-NAME (bcl)
-- weldr: Add distros to testState (bcl)
-- Add support for modules list --distro=DISTRO-NAME (bcl)
-- weldr: Add AppendQuery helper function (bcl)
-- Add support for compose types --distro=DISTRO-NAME (bcl)
-- composer-cli: Add distros list command (bcl)
-- weldr: Add ListDistros function and tests (bcl)
-- Makefile: Add scratch-srpm and scratch-rpm targets (bcl)
-- Print filename for compose results (bcl)
-- ExcuteTests - return the correct error variables in case of errors (atodorov)
-- The rpm package should obsolete composer-cli from lorax (bcl)
-- tests: Enable CodeCov.io (atodorov)
-- actions: Install lint using GOPATH (bcl)
+* Mon Oct 04 2021 Brian C. Lane <bcl@redhat.com> - 35.3-1
+- New release: 35.3 (bcl)
+- spec: Adjust build methods for RHEL 8 (bcl)
+- github: Run build-in-podman to test building package (bcl)
+- spec: Use v2 module (bcl)
+- Makefile: Use v2 module (bcl)
+- Makefile: Add a build-in-podman target (bcl)
+- tests: Add JSON and error result testing to status (bcl)
+- tests: Add JSON and error result testing to sources (bcl)
+- tests: Add JSON and error result testing to projects (bcl)
+- tests: Add JSON and error result testing to modules (bcl)
+- tests: Add JSON and error result testing to distros (bcl)
+- tests: Add JSON and error result testing to compose (bcl)
+- tests: Add JSON and error result testing to blueprints (bcl)
+- test: Fix test client setup and output capture code (bcl)
+- test: Close output capture in printwrap_test (bcl)
+- test: reset the root flags on every ExecuteTest call (bcl)
+- status: Use ExecutionErrors for API errors (bcl)
+- sources: Use ExecutionErrors for API errors (bcl)
+- projects: Use ExecutionErrors for API errors (bcl)
+- modules: Use ExecutionErrors for API errors (bcl)
+- distros: Use ExecutionErrors for API errors (bcl)
+- compose: Use ExecutionErrors for API errors (bcl)
+- blueprints: Use ExecutionErrors for API errors (bcl)
+- composer-cli: Turn off normal command Stdout when --json is used (bcl)
+- weldr: Fix Stringer interface on API messages (bcl)
+- weldr: Clean up error message return code (bcl)
+- weldr: Move Unmarshal error to error position (bcl)
+- root: Add a helper function to print a list of errors (bcl)
+- Use GetFilePath for ComposeImage (bcl)
+- Use GetFilePath for ComposeResults (bcl)
+- Use GetFilePath for ComposerMetadata (bcl)
+- Use GetFilePath for ComposeLogs (bcl)
+- weldr: Add GetFilePath to download a file to a path (bcl)
+- Creating v2 module for breaking API changes (bcl)
+- Makefile: Add update-mods target (bcl)
+- vendor: Update the modules and vendor directory (bcl)
+- Bump go version to 1.15 (bcl)
+- Limit dependabot to 1 PR (bcl)
+- Enable Dependabot service (atodorov)
+- tests: Fix integration tests (bcl)
\ No newline at end of file

From 4a51d0c5790ef716fa19bcf2f8c99c7a3891d65e Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 29 Oct 2021 08:47:43 -0700
Subject: [PATCH 05/33] - New release: 35.4 (bcl) - test: More detailed error
 for test compose failure (bcl) - weldr: Return a helpful error for socket
 problems (bcl) - spec: Add build flags to composer-cli-test build cmdline
 (bcl)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 52 ++++++++---------------------------------------
 3 files changed, 12 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9f53a7..d80edd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 /weldr-client-35.2.tar.gz.asc
 /weldr-client-35.3.tar.gz
 /weldr-client-35.3.tar.gz.asc
+/weldr-client-35.4.tar.gz
+/weldr-client-35.4.tar.gz.asc
diff --git a/sources b/sources
index d76c351..305a6bb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.3.tar.gz) = 1f2a79598dbd6d757a3c5ed26434f945659e0ee047a6f241f032325e19688f9722cbbb7e968e0858aa6d276b6d0013ef551b2957fda7b3f68c521a05e9e45ad7
-SHA512 (weldr-client-35.3.tar.gz.asc) = 257c806de93fe83e2bb305af97dd1e3676b83916b67cb5ce7d9ba7131084226bbfa0900ca6647464be6ad88ec2554561b86c4acab01f64b20e6ec61591b08747
+SHA512 (weldr-client-35.4.tar.gz) = aa60fac82cf146e0780c11034b22c22b997641a8e9135cb96c5e6bf874bee96b68376845557969a1e93a43e3b8552066f9738b96e05e31947c673a27e7ce2c5e
+SHA512 (weldr-client-35.4.tar.gz.asc) = 718dd5c9693bf47da2856977f3b8bfe3c39ec5824a700791af5ddf926ddc4145e060215e34067bfd19338552051117722dd1dfa62713c17c65d7474e20bdc041
 SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client.spec b/weldr-client.spec
index 0e6f25f..f1e7306 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.3
+Version:   35.4
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
@@ -83,8 +83,8 @@ export BUILDTAGS="integration"
 # On Fedora, also turn off go modules and set the path to the one into which
 # the golang-* packages install source code.
 %if 0%{?rhel}
-export LDFLAGS="${LDFLAGS:-} -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
-go test -c -tags=integration -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
+export LDFLAGS="${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+go test -c -tags=integration -buildmode pie -compiler gc -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
 %else
 make GOBUILDFLAGS="%{gobuildflags}" integration
 %endif
@@ -131,44 +131,8 @@ composer-cli package.
 
 
 %changelog
-* Mon Oct 04 2021 Brian C. Lane <bcl@redhat.com> - 35.3-1
-- New release: 35.3 (bcl)
-- spec: Adjust build methods for RHEL 8 (bcl)
-- github: Run build-in-podman to test building package (bcl)
-- spec: Use v2 module (bcl)
-- Makefile: Use v2 module (bcl)
-- Makefile: Add a build-in-podman target (bcl)
-- tests: Add JSON and error result testing to status (bcl)
-- tests: Add JSON and error result testing to sources (bcl)
-- tests: Add JSON and error result testing to projects (bcl)
-- tests: Add JSON and error result testing to modules (bcl)
-- tests: Add JSON and error result testing to distros (bcl)
-- tests: Add JSON and error result testing to compose (bcl)
-- tests: Add JSON and error result testing to blueprints (bcl)
-- test: Fix test client setup and output capture code (bcl)
-- test: Close output capture in printwrap_test (bcl)
-- test: reset the root flags on every ExecuteTest call (bcl)
-- status: Use ExecutionErrors for API errors (bcl)
-- sources: Use ExecutionErrors for API errors (bcl)
-- projects: Use ExecutionErrors for API errors (bcl)
-- modules: Use ExecutionErrors for API errors (bcl)
-- distros: Use ExecutionErrors for API errors (bcl)
-- compose: Use ExecutionErrors for API errors (bcl)
-- blueprints: Use ExecutionErrors for API errors (bcl)
-- composer-cli: Turn off normal command Stdout when --json is used (bcl)
-- weldr: Fix Stringer interface on API messages (bcl)
-- weldr: Clean up error message return code (bcl)
-- weldr: Move Unmarshal error to error position (bcl)
-- root: Add a helper function to print a list of errors (bcl)
-- Use GetFilePath for ComposeImage (bcl)
-- Use GetFilePath for ComposeResults (bcl)
-- Use GetFilePath for ComposerMetadata (bcl)
-- Use GetFilePath for ComposeLogs (bcl)
-- weldr: Add GetFilePath to download a file to a path (bcl)
-- Creating v2 module for breaking API changes (bcl)
-- Makefile: Add update-mods target (bcl)
-- vendor: Update the modules and vendor directory (bcl)
-- Bump go version to 1.15 (bcl)
-- Limit dependabot to 1 PR (bcl)
-- Enable Dependabot service (atodorov)
-- tests: Fix integration tests (bcl)
\ No newline at end of file
+* Fri Oct 29 2021 Brian C. Lane <bcl@redhat.com> - 35.4-1
+- New release: 35.4 (bcl)
+- test: More detailed error for test compose failure (bcl)
+- weldr: Return a helpful error for socket problems (bcl)
+- spec: Add build flags to composer-cli-test build cmdline (bcl)
\ No newline at end of file

From a399885bc05e9a0970735be29a71698c7cc10b14 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 04:23:44 +0000
Subject: [PATCH 06/33] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index f1e7306..e3a9cd9 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -131,6 +131,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Oct 29 2021 Brian C. Lane <bcl@redhat.com> - 35.4-1
 - New release: 35.4 (bcl)
 - test: More detailed error for test compose failure (bcl)

From 1a170c28b755eba0ceb9795e0bb047e0b2f26fb0 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 14 Feb 2022 14:36:26 -0800
Subject: [PATCH 07/33] - New release: 35.5 (bcl) - docs: Explain how to undo
 blueprints delete (bcl) - test: server status no longer returns devel (bcl) -
 Use GetFrozenBlueprintsTOML for blueprints freeze save (bcl) - Add a test for
 float uid/gid in frozen blueprint (bcl) - Use GetBlueprintsTOML for
 blueprints save (bcl) - test: Add a test for float uid/gid in saved blueprint
 (bcl) - build(deps): bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0
 (49699333+dependabot[bot]) - tests: trigger on push to main (jrusz) -
 build(deps): bump github.com/spf13/cobra from 1.2.1 to 1.3.0
 (49699333+dependabot[bot]) - ci: add keystore for sonarqube (jrusz) - spec:
 Switch to using %gobuild macro on Fedora (bcl) - ci: change workflow name
 (jrusz) - ci: add gitlab-ci and sonarqube (jrusz) - doc: fix example links
 from the README (tdecacqu) - build(deps): bump actions/checkout from 2.3.4 to
 2.4.0 (49699333+dependabot[bot]) - ci: Enable Coverity Scan tool (atodorov)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 39 ++++++++++++++++++++++-----------------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index d80edd5..ce42926 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /weldr-client-35.3.tar.gz.asc
 /weldr-client-35.4.tar.gz
 /weldr-client-35.4.tar.gz.asc
+/weldr-client-35.5.tar.gz
+/weldr-client-35.5.tar.gz.asc
diff --git a/sources b/sources
index 305a6bb..38de0fe 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.4.tar.gz) = aa60fac82cf146e0780c11034b22c22b997641a8e9135cb96c5e6bf874bee96b68376845557969a1e93a43e3b8552066f9738b96e05e31947c673a27e7ce2c5e
-SHA512 (weldr-client-35.4.tar.gz.asc) = 718dd5c9693bf47da2856977f3b8bfe3c39ec5824a700791af5ddf926ddc4145e060215e34067bfd19338552051117722dd1dfa62713c17c65d7474e20bdc041
+SHA512 (weldr-client-35.5.tar.gz) = 81f4a97ce1f1081ea27d0f5e3513ef705586b5b29ff4f9047e067888af4784472c79203397aa8e567414f3e92a1b1fef55412d0e151adaef01f96cc5ec0cceb3
+SHA512 (weldr-client-35.5.tar.gz.asc) = 3116b9481bf43eea82029b15bbc972341ef2cc9e73e97bf60490458085cba0f4fe0adb4651688101ffaa2e41f5f5f112a5a6555be3253d3666faf801e3d157cc
 SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
diff --git a/weldr-client.spec b/weldr-client.spec
index e3a9cd9..088f95f 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.4
-Release:   2%{?dist}
+Version:   35.5
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -62,12 +62,11 @@ install -m 0755 -vd _bin
 export PATH=$PWD/_bin${PATH:+:$PATH}
 export GOPATH=$GO_BUILD_PATH:%{gopath}
 export GOFLAGS=-mod=vendor
-%gobuild -o composer-cli %{goipath}/cmd/composer-cli
 %else
 export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"
 export GO111MODULE=off
-make GOBUILDFLAGS="%{gobuildflags}" build
 %endif
+%gobuild -o composer-cli %{goipath}/cmd/composer-cli
 
 
 ## TODO
@@ -80,14 +79,10 @@ export BUILDTAGS="integration"
 # golang's testing package. The RHEL 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
+# On Fedora go modules have already been turned off, and the path set to the one into which
 # the golang-* packages install source code.
-%if 0%{?rhel}
 export LDFLAGS="${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
 go test -c -tags=integration -buildmode pie -compiler gc -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
-%else
-make GOBUILDFLAGS="%{gobuildflags}" integration
-%endif
 %endif
 
 %install
@@ -131,11 +126,21 @@ composer-cli package.
 
 
 %changelog
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Oct 29 2021 Brian C. Lane <bcl@redhat.com> - 35.4-1
-- New release: 35.4 (bcl)
-- test: More detailed error for test compose failure (bcl)
-- weldr: Return a helpful error for socket problems (bcl)
-- spec: Add build flags to composer-cli-test build cmdline (bcl)
\ No newline at end of file
+* Mon Feb 14 2022 Brian C. Lane <bcl@redhat.com> - 35.5-1
+- New release: 35.5 (bcl)
+- docs: Explain how to undo blueprints delete (bcl)
+- test: server status no longer returns devel (bcl)
+- Use GetFrozenBlueprintsTOML for blueprints freeze save (bcl)
+- Add a test for float uid/gid in frozen blueprint (bcl)
+- Use GetBlueprintsTOML for blueprints save (bcl)
+- test: Add a test for float uid/gid in saved blueprint (bcl)
+- build(deps): bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0 (49699333+dependabot[bot])
+- tests: trigger on push to main (jrusz)
+- build(deps): bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (49699333+dependabot[bot])
+- ci: add keystore for sonarqube (jrusz)
+- spec: Switch to using %%gobuild macro on Fedora (bcl)
+- ci: change workflow name (jrusz)
+- ci: add gitlab-ci and sonarqube (jrusz)
+- doc: fix example links from the README (tdecacqu)
+- build(deps): bump actions/checkout from 2.3.4 to 2.4.0 (49699333+dependabot[bot])
+- ci: Enable Coverity Scan tool (atodorov)

From f7d79ff34d51acda83f297428aaba8888aa59d6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sat, 18 Jun 2022 12:25:05 +0200
Subject: [PATCH 08/33] Rebuilt for CVE-2022-1996, CVE-2022-24675,
 CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629

---
 weldr-client.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 088f95f..b5f5138 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.5
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -126,6 +126,10 @@ composer-cli package.
 
 
 %changelog
+* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 35.5-2
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629
+
 * Mon Feb 14 2022 Brian C. Lane <bcl@redhat.com> - 35.5-1
 - New release: 35.5 (bcl)
 - docs: Explain how to undo blueprints delete (bcl)

From 98751ff2f49f847477dfa670adfb8e4357a816d1 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 15 Jul 2022 08:22:00 -0700
Subject: [PATCH 09/33] - build(deps): bump github.com/spf13/cobra from 1.4.0
 to 1.5.0 (49699333+dependabot[bot]) - tests: Update tests for
 osbuild-composer changes (bcl) - build(deps): bump
 github.com/stretchr/testify from 1.7.2 to 1.7.4 (49699333+dependabot[bot]) -
 CMD: Compose status format (eloy.coto) - CMD: Compose list format (eloy.coto)
 - tests: Update tests to check for JSON list output (bcl) - composer-cli:
 Change JSON output to be a list of objects (bcl) - build(deps): bump
 github.com/stretchr/testify from 1.7.1 to 1.7.2 (49699333+dependabot[bot]) -
 weldr: Simplify the old ComposeLog, etc. functions (bcl) - composer-cli: Add
 --filename to blueprints freeze save command (bcl) - composer-cli: Add
 --filename to blueprints save command (bcl) - composer-cli: Add --filename to
 compose logs command (bcl) - composer-cli: Add --filename to compose image
 command (bcl) - composer-cli: Add --filename to compose metadata command
 (bcl) - composer-cli: Add --filename to compose results command (bcl) -
 weldr: Add saving to a new filename to GetFilePath function (bcl) - github:
 Fix issue with codecov and forced pushes in PRs (bcl) - Use golangci-lint
 1.45.2 in workflow (bcl) - Run workflow tests for go 1.16.x and 1.17.x (bcl)
 - Move go.mod to go 1.16 (bcl) - workflows/trigger-gitlab: run Gitlab CI in
 new image-builder project (jrusz) - build(deps): bump actions/setup-go from 2
 to 3 (49699333+dependabot[bot]) - build(deps): bump
 github.com/BurntSushi/toml from 1.0.0 to 1.1.0 (49699333+dependabot[bot]) -
 build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1
 (49699333+dependabot[bot]) - build(deps): bump actions/checkout from 2.4.0 to
 3 (49699333+dependabot[bot]) - build(deps): bump github.com/spf13/cobra from
 1.3.0 to 1.4.0 (49699333+dependabot[bot])

---
 .gitignore        |  2 ++
 sources           |  5 ++---
 weldr-client.spec | 55 ++++++++++++++++++++++++++---------------------
 3 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce42926..06e79e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /weldr-client-35.4.tar.gz.asc
 /weldr-client-35.5.tar.gz
 /weldr-client-35.5.tar.gz.asc
+/weldr-client-35.6.tar.gz
+/weldr-client-35.6.tar.gz.asc
diff --git a/sources b/sources
index 38de0fe..d30c27d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (weldr-client-35.5.tar.gz) = 81f4a97ce1f1081ea27d0f5e3513ef705586b5b29ff4f9047e067888af4784472c79203397aa8e567414f3e92a1b1fef55412d0e151adaef01f96cc5ec0cceb3
-SHA512 (weldr-client-35.5.tar.gz.asc) = 3116b9481bf43eea82029b15bbc972341ef2cc9e73e97bf60490458085cba0f4fe0adb4651688101ffaa2e41f5f5f112a5a6555be3253d3666faf801e3d157cc
-SHA512 (gpg-117E8C168EFE3A7F.key) = 9c760460e3227848c99a1178828512056ac04f518f98bdab5ef36d2aa31c4e5dcda3800d7141cfaf7f2acd0f7f35d4b9971083b6f14f8a36231b74041d4ed88d
+SHA512 (weldr-client-35.6.tar.gz) = ed6a20c38a5c245cec8946a9bac5df05dcf0943cf9732ea6eefe95de451096dd6f2bd732def2b0629614805410adeacebc95a7b6344d4a7c21bb01857a138db4
+SHA512 (weldr-client-35.6.tar.gz.asc) = 83c8ccf635fa4182f019354cedcff8669c3f4d4ca9eac501519d41724d899005f6c0496c3b87157b8bcec0623b47dcc027d4595b7c21b56b0d14340f0515b83a
diff --git a/weldr-client.spec b/weldr-client.spec
index b5f5138..329bf66 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.5
-Release:   2%{?dist}
+Version:   35.6
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -126,25 +126,32 @@ composer-cli package.
 
 
 %changelog
-* Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 35.5-2
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Mon Feb 14 2022 Brian C. Lane <bcl@redhat.com> - 35.5-1
-- New release: 35.5 (bcl)
-- docs: Explain how to undo blueprints delete (bcl)
-- test: server status no longer returns devel (bcl)
-- Use GetFrozenBlueprintsTOML for blueprints freeze save (bcl)
-- Add a test for float uid/gid in frozen blueprint (bcl)
-- Use GetBlueprintsTOML for blueprints save (bcl)
-- test: Add a test for float uid/gid in saved blueprint (bcl)
-- build(deps): bump github.com/BurntSushi/toml from 0.4.1 to 1.0.0 (49699333+dependabot[bot])
-- tests: trigger on push to main (jrusz)
-- build(deps): bump github.com/spf13/cobra from 1.2.1 to 1.3.0 (49699333+dependabot[bot])
-- ci: add keystore for sonarqube (jrusz)
-- spec: Switch to using %%gobuild macro on Fedora (bcl)
-- ci: change workflow name (jrusz)
-- ci: add gitlab-ci and sonarqube (jrusz)
-- doc: fix example links from the README (tdecacqu)
-- build(deps): bump actions/checkout from 2.3.4 to 2.4.0 (49699333+dependabot[bot])
-- ci: Enable Coverity Scan tool (atodorov)
+* Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-1
+- New release: 35.6 (bcl)
+- build(deps): bump github.com/spf13/cobra from 1.4.0 to 1.5.0 (49699333+dependabot[bot])
+- tests: Update tests for osbuild-composer changes (bcl)
+- build(deps): bump github.com/stretchr/testify from 1.7.2 to 1.7.4 (49699333+dependabot[bot])
+- CMD: Compose status format (eloy.coto)
+- CMD: Compose list format (eloy.coto)
+- tests: Update tests to check for JSON list output (bcl)
+- composer-cli: Change JSON output to be a list of objects (bcl)
+- build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.2 (49699333+dependabot[bot])
+- weldr: Simplify the old ComposeLog, etc. functions (bcl)
+- composer-cli: Add --filename to blueprints freeze save command (bcl)
+- composer-cli: Add --filename to blueprints save command (bcl)
+- composer-cli: Add --filename to compose logs command (bcl)
+- composer-cli: Add --filename to compose image command (bcl)
+- composer-cli: Add --filename to compose metadata command (bcl)
+- composer-cli: Add --filename to compose results command (bcl)
+- weldr: Add saving to a new filename to GetFilePath function (bcl)
+- github: Fix issue with codecov and forced pushes in PRs (bcl)
+- Use golangci-lint 1.45.2 in workflow (bcl)
+- Run workflow tests for go 1.16.x and 1.17.x (bcl)
+- Move go.mod to go 1.16 (bcl)
+- workflows/trigger-gitlab: run Gitlab CI in new image-builder project (jrusz)
+- build(deps): bump actions/setup-go from 2 to 3 (49699333+dependabot[bot])
+- build(deps): bump github.com/BurntSushi/toml from 1.0.0 to 1.1.0 (49699333+dependabot[bot])
+- build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1 (49699333+dependabot[bot])
+- build(deps): bump actions/checkout from 2.4.0 to 3 (49699333+dependabot[bot])
+- build(deps): bump github.com/spf13/cobra from 1.3.0 to 1.4.0 (49699333+dependabot[bot])
+- New release: 35.5 (bcl)
\ No newline at end of file

From ca49421f2fa9db87fba8d6a2253d4b684eeec798 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 15 Jul 2022 08:36:29 -0700
Subject: [PATCH 10/33] - Add missing gpg key to sources

---
 sources           | 1 +
 weldr-client.spec | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index d30c27d..2a9d8b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (weldr-client-35.6.tar.gz) = ed6a20c38a5c245cec8946a9bac5df05dcf0943cf9732ea6eefe95de451096dd6f2bd732def2b0629614805410adeacebc95a7b6344d4a7c21bb01857a138db4
 SHA512 (weldr-client-35.6.tar.gz.asc) = 83c8ccf635fa4182f019354cedcff8669c3f4d4ca9eac501519d41724d899005f6c0496c3b87157b8bcec0623b47dcc027d4595b7c21b56b0d14340f0515b83a
+SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
diff --git a/weldr-client.spec b/weldr-client.spec
index 329bf66..d62ed58 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.6
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -126,6 +126,9 @@ composer-cli package.
 
 
 %changelog
+* Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-2
+- Add missing gpg key to sources
+
 * Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-1
 - New release: 35.6 (bcl)
 - build(deps): bump github.com/spf13/cobra from 1.4.0 to 1.5.0 (49699333+dependabot[bot])
@@ -154,4 +157,4 @@ composer-cli package.
 - build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1 (49699333+dependabot[bot])
 - build(deps): bump actions/checkout from 2.4.0 to 3 (49699333+dependabot[bot])
 - build(deps): bump github.com/spf13/cobra from 1.3.0 to 1.4.0 (49699333+dependabot[bot])
-- New release: 35.5 (bcl)
\ No newline at end of file
+- New release: 35.5 (bcl)

From 3b68bd407503953c885e39c65fbbd17a2e9b8494 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 12:20:33 +0000
Subject: [PATCH 11/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index d62ed58..0a1071c 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.6
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -126,6 +126,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-2
 - Add missing gpg key to sources
 

From 327e68eaa0a3bce060c9a1cba26be5fa4dbfd7e2 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 8 Sep 2022 15:21:20 -0700
Subject: [PATCH 12/33] - New release: 35.7 (bcl) - spec: Move %gometa macro
 above %gourl (bcl) - weldr: When starting a compose pass size as bytes, not
 MiB (bcl) - tests: Use correct size value in bytes for test (bcl) - workflow:
 Add Go 1.18 to text matrix (bcl) - Replace deprecated ioutil functions (bcl)
 - build(deps): bump github.com/BurntSushi/toml from 1.1.0 to 1.2.0
 (49699333+dependabot[bot]) - build(deps): bump github.com/stretchr/testify
 from 1.7.4 to 1.8.0 (49699333+dependabot[bot])

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 52 ++++++++++++-----------------------------------
 3 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06e79e4..c9d74b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@
 /weldr-client-35.5.tar.gz.asc
 /weldr-client-35.6.tar.gz
 /weldr-client-35.6.tar.gz.asc
+/weldr-client-35.7.tar.gz
+/weldr-client-35.7.tar.gz.asc
diff --git a/sources b/sources
index 2a9d8b5..990de7f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.6.tar.gz) = ed6a20c38a5c245cec8946a9bac5df05dcf0943cf9732ea6eefe95de451096dd6f2bd732def2b0629614805410adeacebc95a7b6344d4a7c21bb01857a138db4
-SHA512 (weldr-client-35.6.tar.gz.asc) = 83c8ccf635fa4182f019354cedcff8669c3f4d4ca9eac501519d41724d899005f6c0496c3b87157b8bcec0623b47dcc027d4595b7c21b56b0d14340f0515b83a
+SHA512 (weldr-client-35.7.tar.gz) = 37f5606d5989b99ab31b01c4e160a78ed9fb0e5a2fa73de0599ae71b36c5c29594c4e3b77552a8378e5f577c648d414d6da543f15763ff0a374cd029a53c405d
+SHA512 (weldr-client-35.7.tar.gz.asc) = 0322f77861e324044b2bd3d358a1236d7b9fccbaa226f81f232baee458e0b82170758a22e19dc38b610476d1c823ff84d8b31a98af26a1842603f06035102e87
 SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
diff --git a/weldr-client.spec b/weldr-client.spec
index 0a1071c..c257aa5 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,11 +6,13 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.6
-Release:   3%{?dist}
+Version:   35.7
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
+
+%gometa
 Url:       %{gourl}
 Source0:   https://github.com/osbuild/weldr-client/releases/download/v%{version}/%{name}-%{version}.tar.gz
 %if %{with signed}
@@ -21,8 +23,6 @@ Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-
 Obsoletes: composer-cli < 35.0
 Provides: composer-cli = %{version}-%{release}
 
-%gometa
-
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 %if 0%{?fedora}
 BuildRequires:  golang(github.com/BurntSushi/toml)
@@ -126,38 +126,12 @@ composer-cli package.
 
 
 %changelog
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 35.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-2
-- Add missing gpg key to sources
-
-* Fri Jul 15 2022 Brian C. Lane <bcl@redhat.com> - 35.6-1
-- New release: 35.6 (bcl)
-- build(deps): bump github.com/spf13/cobra from 1.4.0 to 1.5.0 (49699333+dependabot[bot])
-- tests: Update tests for osbuild-composer changes (bcl)
-- build(deps): bump github.com/stretchr/testify from 1.7.2 to 1.7.4 (49699333+dependabot[bot])
-- CMD: Compose status format (eloy.coto)
-- CMD: Compose list format (eloy.coto)
-- tests: Update tests to check for JSON list output (bcl)
-- composer-cli: Change JSON output to be a list of objects (bcl)
-- build(deps): bump github.com/stretchr/testify from 1.7.1 to 1.7.2 (49699333+dependabot[bot])
-- weldr: Simplify the old ComposeLog, etc. functions (bcl)
-- composer-cli: Add --filename to blueprints freeze save command (bcl)
-- composer-cli: Add --filename to blueprints save command (bcl)
-- composer-cli: Add --filename to compose logs command (bcl)
-- composer-cli: Add --filename to compose image command (bcl)
-- composer-cli: Add --filename to compose metadata command (bcl)
-- composer-cli: Add --filename to compose results command (bcl)
-- weldr: Add saving to a new filename to GetFilePath function (bcl)
-- github: Fix issue with codecov and forced pushes in PRs (bcl)
-- Use golangci-lint 1.45.2 in workflow (bcl)
-- Run workflow tests for go 1.16.x and 1.17.x (bcl)
-- Move go.mod to go 1.16 (bcl)
-- workflows/trigger-gitlab: run Gitlab CI in new image-builder project (jrusz)
-- build(deps): bump actions/setup-go from 2 to 3 (49699333+dependabot[bot])
-- build(deps): bump github.com/BurntSushi/toml from 1.0.0 to 1.1.0 (49699333+dependabot[bot])
-- build(deps): bump github.com/stretchr/testify from 1.7.0 to 1.7.1 (49699333+dependabot[bot])
-- build(deps): bump actions/checkout from 2.4.0 to 3 (49699333+dependabot[bot])
-- build(deps): bump github.com/spf13/cobra from 1.3.0 to 1.4.0 (49699333+dependabot[bot])
-- New release: 35.5 (bcl)
+* Thu Sep 08 2022 Brian C. Lane <bcl@redhat.com> - 35.7-1
+- New release: 35.7 (bcl)
+- spec: Move %gometa macro above %gourl (bcl)
+- weldr: When starting a compose pass size as bytes, not MiB (bcl)
+- tests: Use correct size value in bytes for test (bcl)
+- workflow: Add Go 1.18 to text matrix (bcl)
+- Replace deprecated ioutil functions (bcl)
+- build(deps): bump github.com/BurntSushi/toml from 1.1.0 to 1.2.0 (49699333+dependabot[bot])
+- build(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 (49699333+dependabot[bot])

From 6130db0954259562ab5a5ec9d6427f699d367f84 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Fri, 30 Sep 2022 11:35:50 -0700
Subject: [PATCH 13/33] - New release: 35.8 (bcl) - completion: Remove
 providers from bash completion script (bcl) - completion: Filter out new
 headers from compose list (bcl) - docs: Remove unneeded Long descriptions
 (bcl) - docs: Use a custom help template (bcl) - docs: Add more command
 documentation (bcl) - cmdline: Add package glob support to modules list
 command (bcl) - workflow: Add govulncheck on go v1.18 (bcl) - tests: Update
 to use golangci-lint 1.49.0 (bcl)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c9d74b2..a8c1701 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /weldr-client-35.6.tar.gz.asc
 /weldr-client-35.7.tar.gz
 /weldr-client-35.7.tar.gz.asc
+/weldr-client-35.8.tar.gz
+/weldr-client-35.8.tar.gz.asc
diff --git a/sources b/sources
index 990de7f..6860f55 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.7.tar.gz) = 37f5606d5989b99ab31b01c4e160a78ed9fb0e5a2fa73de0599ae71b36c5c29594c4e3b77552a8378e5f577c648d414d6da543f15763ff0a374cd029a53c405d
-SHA512 (weldr-client-35.7.tar.gz.asc) = 0322f77861e324044b2bd3d358a1236d7b9fccbaa226f81f232baee458e0b82170758a22e19dc38b610476d1c823ff84d8b31a98af26a1842603f06035102e87
+SHA512 (weldr-client-35.8.tar.gz) = 356fad74a1950d6aa18c879d4a51ff1b615f3d2187ace34ab2e03c48c93a966b1a0274bffd6a6a3ff2e46b940a14fb8023ddfb7f9b2787c027adccbb1a09a627
+SHA512 (weldr-client-35.8.tar.gz.asc) = 603adf27b5870fd236ca2af9dd05639720b9c44b65eccb83a4e26459d082bb87ca8138a0799e7a217b39059e40209fff566de24436bca7b13588de5fa0bd1e77
 SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
diff --git a/weldr-client.spec b/weldr-client.spec
index c257aa5..edd1fdf 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.7
+Version:   35.8
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
@@ -126,12 +126,13 @@ composer-cli package.
 
 
 %changelog
-* Thu Sep 08 2022 Brian C. Lane <bcl@redhat.com> - 35.7-1
-- New release: 35.7 (bcl)
-- spec: Move %gometa macro above %gourl (bcl)
-- weldr: When starting a compose pass size as bytes, not MiB (bcl)
-- tests: Use correct size value in bytes for test (bcl)
-- workflow: Add Go 1.18 to text matrix (bcl)
-- Replace deprecated ioutil functions (bcl)
-- build(deps): bump github.com/BurntSushi/toml from 1.1.0 to 1.2.0 (49699333+dependabot[bot])
-- build(deps): bump github.com/stretchr/testify from 1.7.4 to 1.8.0 (49699333+dependabot[bot])
+* Fri Sep 30 2022 Brian C. Lane <bcl@redhat.com> - 35.8-1
+- New release: 35.8 (bcl)
+- completion: Remove providers from bash completion script (bcl)
+- completion: Filter out new headers from compose list (bcl)
+- docs: Remove unneeded Long descriptions (bcl)
+- docs: Use a custom help template (bcl)
+- docs: Add more command documentation (bcl)
+- cmdline: Add package glob support to modules list command (bcl)
+- workflow: Add govulncheck on go v1.18 (bcl)
+- tests: Update to use golangci-lint 1.49.0 (bcl)
\ No newline at end of file

From 71582c2bba8bd8fe0d337023db557b804d058f36 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 30 Nov 2022 16:27:23 -0800
Subject: [PATCH 14/33] - New release: 35.9 (bcl) - tests: Replace os.MkdirTemp
 with t.TempDir (bcl) - blueprint save: Allow overriding bad blueprint names
 (bcl) - tests: Clean up checking err in tests (bcl) - composer-cli: Implement
 blueprints diff (bcl) - saveBlueprint: Return the filename to the caller
 (bcl) - composer-cli: Add tests for using --commit with old servers (bcl) -
 weldr: Return error about the blueprints change route (bcl) - weldr: Save the
 http status code as part of APIResponse (bcl) - Add --commit support to
 blueprints save (bcl) - Add --commit to blueprints show (bcl) - gitleaks:
 Exclude the test password used in tests (bcl) - ci: add tags to AWS instances
 (tlavocat) - build(deps): bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1
 (49699333+dependabot[bot]) - build(deps): bump github.com/stretchr/testify
 from 1.8.0 to 1.8.1 (49699333+dependabot[bot]) - build(deps): bump
 github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot])

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 31 ++++++++++++++++++++-----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8c1701..04df71d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /weldr-client-35.7.tar.gz.asc
 /weldr-client-35.8.tar.gz
 /weldr-client-35.8.tar.gz.asc
+/weldr-client-35.9.tar.gz
+/weldr-client-35.9.tar.gz.asc
diff --git a/sources b/sources
index 6860f55..5429231 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.8.tar.gz) = 356fad74a1950d6aa18c879d4a51ff1b615f3d2187ace34ab2e03c48c93a966b1a0274bffd6a6a3ff2e46b940a14fb8023ddfb7f9b2787c027adccbb1a09a627
-SHA512 (weldr-client-35.8.tar.gz.asc) = 603adf27b5870fd236ca2af9dd05639720b9c44b65eccb83a4e26459d082bb87ca8138a0799e7a217b39059e40209fff566de24436bca7b13588de5fa0bd1e77
+SHA512 (weldr-client-35.9.tar.gz) = bf4a74bd601e9bf789961754488ca8522938c7b5807f0e2e01b53bb9ca4d8a21823fcb54bc4fb81b7299010f0c81a8d33daa2d9d1a2e0935d271536c3e417fcd
+SHA512 (weldr-client-35.9.tar.gz.asc) = e5e8ddf7b99532dec856511e98b12ed985815dd9b42e4e8e8cfa2c2d7dd8eebd88acb9f164f9f339e072faca5a3ef8dfa5b4e14450dc04744d1a73274c7d4b30
 SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
diff --git a/weldr-client.spec b/weldr-client.spec
index edd1fdf..43c946f 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.8
+Version:   35.9
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
@@ -23,6 +23,8 @@ Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-
 Obsoletes: composer-cli < 35.0
 Provides: composer-cli = %{version}-%{release}
 
+Requires: diffutils
+
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 %if 0%{?fedora}
 BuildRequires:  golang(github.com/BurntSushi/toml)
@@ -126,13 +128,20 @@ composer-cli package.
 
 
 %changelog
-* Fri Sep 30 2022 Brian C. Lane <bcl@redhat.com> - 35.8-1
-- New release: 35.8 (bcl)
-- completion: Remove providers from bash completion script (bcl)
-- completion: Filter out new headers from compose list (bcl)
-- docs: Remove unneeded Long descriptions (bcl)
-- docs: Use a custom help template (bcl)
-- docs: Add more command documentation (bcl)
-- cmdline: Add package glob support to modules list command (bcl)
-- workflow: Add govulncheck on go v1.18 (bcl)
-- tests: Update to use golangci-lint 1.49.0 (bcl)
\ No newline at end of file
+* Wed Nov 30 2022 Brian C. Lane <bcl@redhat.com> - 35.9-1
+- New release: 35.9 (bcl)
+- tests: Replace os.MkdirTemp with t.TempDir (bcl)
+- blueprint save: Allow overriding bad blueprint names (bcl)
+- tests: Clean up checking err in tests (bcl)
+- composer-cli: Implement blueprints diff (bcl)
+- saveBlueprint: Return the filename to the caller (bcl)
+- composer-cli: Add tests for using --commit with old servers (bcl)
+- weldr: Return error about the blueprints change route (bcl)
+- weldr: Save the http status code as part of APIResponse (bcl)
+- Add --commit support to blueprints save (bcl)
+- Add --commit to blueprints show (bcl)
+- gitleaks: Exclude the test password used in tests (bcl)
+- ci: add tags to AWS instances (tlavocat)
+- build(deps): bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (49699333+dependabot[bot])
+- build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (49699333+dependabot[bot])
+- build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot])
\ No newline at end of file

From 676b93347066c0ad13dc54172e4bf0e27306278b Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 14 Dec 2022 15:55:07 -0800
Subject: [PATCH 15/33] tests: Add tmt tests based on RHEL tests

Also turn on building of weldr-client-tests, it is needed by the tmt tests.
---
 .fmf/version                |  1 +
 gating.yaml                 |  7 ++++
 plans/integration-tests.fmf | 10 ++++++
 tests/scripts/run_tests.sh  | 67 +++++++++++++++++++++++++++++++++++++
 weldr-client.spec           |  6 ++--
 5 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 gating.yaml
 create mode 100644 plans/integration-tests.fmf
 create mode 100755 tests/scripts/run_tests.sh

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..0c1cc35
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,7 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts: [bodhi_update_push_stable]
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/plans/integration-tests.fmf b/plans/integration-tests.fmf
new file mode 100644
index 0000000..f1de00b
--- /dev/null
+++ b/plans/integration-tests.fmf
@@ -0,0 +1,10 @@
+summary: Run integration tests
+prepare:
+    how: install
+    package:
+    - osbuild-composer
+    - weldr-client
+    - weldr-client-tests
+    - createrepo_c
+execute:
+    script: ./tests/scripts/run_tests.sh ./tests/
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
new file mode 100755
index 0000000..6437f65
--- /dev/null
+++ b/tests/scripts/run_tests.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+set -eux
+
+FAILANY=0
+
+function fail {
+    echo -e "\n\n#### ERROR: $1\n"
+    FAIL=1
+    FAILANY=1
+}
+
+function status {
+    if [ "$FAIL" -eq 0 ]; then
+        echo -e "\n\n#### PASS: $1\n"
+    else
+        echo -e "\n\n#### FAIL: $1\n"
+    fi
+}
+
+function running {
+    FAIL=0
+    echo -e "\n\n#### RUN: $1\n"
+}
+
+backend_start() {
+    export BACKEND="osbuild-composer"
+    systemctl start osbuild-composer.socket
+    RET=$?
+
+    if [ "$RET" -eq 0 ]; then
+        # wait for the backend to become ready
+        tries=0
+        until curl -m 15 --unix-socket /run/weldr/api.socket http://localhost:4000/api/status | grep 'db_supported.*true'; do
+            echo "#### INFO: Waiting for backend to become ready. Try $tries ..."
+            tries=$((tries + 1))
+            if [ $tries -gt 50 ]; then
+                fail "Backend taking too long to become ready"
+                # Log why starting osbuild-composer failed
+                journalctl -u osbuild-composer
+                exit 1
+            fi
+            sleep 10
+        done
+    else
+        fail "Unable to start composer backend (exit code $RET)"
+        # Log why starting osbuild-composer failed
+        journalctl -u osbuild-composer
+        exit $RET
+    fi
+}
+
+: ${1?"Usage: $0 TOPDIR"}
+TOPDIR=$1
+
+# What versions of things do we have installed?
+rpm -q weldr-client osbuild osbuild-composer
+
+composer-cli version || fail "Getting composer-cli version"
+
+# Start osbuild-composer
+backend_start
+
+composer-cli status show || fail "Getting osbuild-composer status"
+
+/usr/libexec/tests/composer-cli/composer-cli-tests -test.v || fail "Running integration tests"
+
+exit $FAILANY
diff --git a/weldr-client.spec b/weldr-client.spec
index 43c946f..d04e6c6 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -1,5 +1,5 @@
-# Pass --with tests to rpmbuild to build composer-cli-tests
-%bcond_with tests
+# Pass --without tests to skip building composer-cli-tests
+%bcond_without tests
 # Pass --without signed to skip gpg signed tar.gz (DO NOT DO THAT IN PRODUCTION)
 %bcond_without signed
 
@@ -144,4 +144,4 @@ composer-cli package.
 - ci: add tags to AWS instances (tlavocat)
 - build(deps): bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (49699333+dependabot[bot])
 - build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (49699333+dependabot[bot])
-- build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot])
\ No newline at end of file
+- build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot])

From 7b4accad57641699b0e77cc27c1212b482ae76d6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 06:44:35 +0000
Subject: [PATCH 16/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index d04e6c6..b7803b9 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.9
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -128,6 +128,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 35.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Nov 30 2022 Brian C. Lane <bcl@redhat.com> - 35.9-1
 - New release: 35.9 (bcl)
 - tests: Replace os.MkdirTemp with t.TempDir (bcl)

From ab3258d4ceac874dd59d9ae869aed148e9b70ac7 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 11 Apr 2023 14:37:10 -0700
Subject: [PATCH 17/33] - New release: 35.10 (bcl) - Add support for compose
 start warning messages (bcl) - build(deps): bump github.com/spf13/cobra from
 1.6.1 to 1.7.0 (49699333+dependabot[bot]) - workflow: Ignore govulncheck
 failures (bcl) - build(deps): bump actions/setup-go from 3 to 4
 (49699333+dependabot[bot]) - workflow: Switch to testing on go 1.18, 1.19,
 1.20 (bcl) - maint: Update to use go v1.18 by default (bcl) - build(deps):
 bump github.com/stretchr/testify from 1.8.1 to 1.8.2
 (49699333+dependabot[bot]) - spec: Require createrepo_c for
 weldr-client-tests package (bcl) - Build weldr-client-tests by default (bcl)
 - spec: migrate the license field to SPDX (ondrej)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 40 +++++++++++++++++-----------------------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 04df71d..9306252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /weldr-client-35.8.tar.gz.asc
 /weldr-client-35.9.tar.gz
 /weldr-client-35.9.tar.gz.asc
+/weldr-client-35.10.tar.gz
+/weldr-client-35.10.tar.gz.asc
diff --git a/sources b/sources
index 5429231..5f56cca 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.9.tar.gz) = bf4a74bd601e9bf789961754488ca8522938c7b5807f0e2e01b53bb9ca4d8a21823fcb54bc4fb81b7299010f0c81a8d33daa2d9d1a2e0935d271536c3e417fcd
-SHA512 (weldr-client-35.9.tar.gz.asc) = e5e8ddf7b99532dec856511e98b12ed985815dd9b42e4e8e8cfa2c2d7dd8eebd88acb9f164f9f339e072faca5a3ef8dfa5b4e14450dc04744d1a73274c7d4b30
+SHA512 (weldr-client-35.10.tar.gz) = 17b357043f4074203eb3886b8ceab8c5510e0e6a602f151f86ecfcd3c078d48a12919256c04c5d9ceb35a40361cffb15626248fea4f02171e356d0379cdc193b
+SHA512 (weldr-client-35.10.tar.gz.asc) = 77931c4e6f920499a8c5e22d8ab92ab6ac78b1e32b2907566c6f5b247a9f30a2b59122c4d377c4f68987b88580141bc7293868500fadcf65534d9537287c54e5
 SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
diff --git a/weldr-client.spec b/weldr-client.spec
index b7803b9..caea829 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,10 +6,10 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.9
-Release:   2%{?dist}
+Version:   35.10
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
-License:   ASL 2.0
+License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
 
 %gometa
@@ -117,6 +117,8 @@ make test
 %package tests
 Summary:    Integration tests for composer-cli
 
+Requires: createrepo_c
+
 %description tests
 Integration tests to be run on a pristine-dedicated system to test the
 composer-cli package.
@@ -128,23 +130,15 @@ composer-cli package.
 
 
 %changelog
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 35.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Nov 30 2022 Brian C. Lane <bcl@redhat.com> - 35.9-1
-- New release: 35.9 (bcl)
-- tests: Replace os.MkdirTemp with t.TempDir (bcl)
-- blueprint save: Allow overriding bad blueprint names (bcl)
-- tests: Clean up checking err in tests (bcl)
-- composer-cli: Implement blueprints diff (bcl)
-- saveBlueprint: Return the filename to the caller (bcl)
-- composer-cli: Add tests for using --commit with old servers (bcl)
-- weldr: Return error about the blueprints change route (bcl)
-- weldr: Save the http status code as part of APIResponse (bcl)
-- Add --commit support to blueprints save (bcl)
-- Add --commit to blueprints show (bcl)
-- gitleaks: Exclude the test password used in tests (bcl)
-- ci: add tags to AWS instances (tlavocat)
-- build(deps): bump github.com/BurntSushi/toml from 1.2.0 to 1.2.1 (49699333+dependabot[bot])
-- build(deps): bump github.com/stretchr/testify from 1.8.0 to 1.8.1 (49699333+dependabot[bot])
-- build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.1 (49699333+dependabot[bot])
+* Tue Apr 11 2023 Brian C. Lane <bcl@redhat.com> - 35.10-1
+- New release: 35.10 (bcl)
+- Add support for compose start warning messages (bcl)
+- build(deps): bump github.com/spf13/cobra from 1.6.1 to 1.7.0 (49699333+dependabot[bot])
+- workflow: Ignore govulncheck failures (bcl)
+- build(deps): bump actions/setup-go from 3 to 4 (49699333+dependabot[bot])
+- workflow: Switch to testing on go 1.18, 1.19, 1.20 (bcl)
+- maint: Update to use go v1.18 by default (bcl)
+- build(deps): bump github.com/stretchr/testify from 1.8.1 to 1.8.2 (49699333+dependabot[bot])
+- spec: Require createrepo_c for weldr-client-tests package (bcl)
+- Build weldr-client-tests by default (bcl)
+- spec: migrate the license field to SPDX (ondrej)

From 52a1cde8b18897b8eb3b00d165f242e7f30eef6a Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 8 Jun 2023 16:18:17 -0700
Subject: [PATCH 18/33] - New release: 35.11 (bcl) - build(deps): bump
 github.com/BurntSushi/toml from 1.3.0 to 1.3.1 (49699333+dependabot[bot]) -
 build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4
 (49699333+dependabot[bot]) - CI: Update terraform hash (bcl) - build(deps):
 bump github.com/BurntSushi/toml from 1.2.1 to 1.3.0
 (49699333+dependabot[bot]) - build(deps): bump github.com/stretchr/testify
 from 1.8.2 to 1.8.3 (49699333+dependabot[bot]) - docs: fix typo/formatting in
 HACKING.md (idiez) - Add release creation documentation (bcl)

---
 .gitignore        |  2 ++
 sources           |  6 +++---
 weldr-client.spec | 23 ++++++++++-------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9306252..f58c71c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@
 /weldr-client-35.9.tar.gz.asc
 /weldr-client-35.10.tar.gz
 /weldr-client-35.10.tar.gz.asc
+/weldr-client-35.11.tar.gz
+/weldr-client-35.11.tar.gz.asc
diff --git a/sources b/sources
index 5f56cca..c5ae9d8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.10.tar.gz) = 17b357043f4074203eb3886b8ceab8c5510e0e6a602f151f86ecfcd3c078d48a12919256c04c5d9ceb35a40361cffb15626248fea4f02171e356d0379cdc193b
-SHA512 (weldr-client-35.10.tar.gz.asc) = 77931c4e6f920499a8c5e22d8ab92ab6ac78b1e32b2907566c6f5b247a9f30a2b59122c4d377c4f68987b88580141bc7293868500fadcf65534d9537287c54e5
-SHA512 (gpg-117E8C168EFE3A7F.key) = 88c0a30ebbaa3b586d5ac5fd5fdcf1f92f58ab580d7770e39ef9ff4ce380c1a748e815d3f9f9c13a6b2d1b1cd554886c360fba7a586f518a8aa7a4972317526b
+SHA512 (weldr-client-35.11.tar.gz) = 76b76ccc4b428c8618bcfc33674a39ecc77af655bc17a11ce0aac0d56610f554242d4febd214f7b107cfc5274704d15d503f5f106bafa74ca675c3b3d28d03e6
+SHA512 (weldr-client-35.11.tar.gz.asc) = bdd0f2b170d99ac0e451e120ed94cce81e688dd52df271d659af6abc8eee921776254056650c5cbd8256e668ddc42547df3ce3dac24eecf18e64a57defafa3ff
+SHA512 (gpg-117E8C168EFE3A7F.key) = e02b3598d3ccdf58a7f34d0e3129f08126bc07cfb0ff98ac96f3325a7612e4e13e0adc09ea68e57f1198181e864e108c1aae718cdbb115326abefd50e969a4fe
diff --git a/weldr-client.spec b/weldr-client.spec
index caea829..0c581b1 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.10
+Version:   35.11
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
@@ -130,15 +130,12 @@ composer-cli package.
 
 
 %changelog
-* Tue Apr 11 2023 Brian C. Lane <bcl@redhat.com> - 35.10-1
-- New release: 35.10 (bcl)
-- Add support for compose start warning messages (bcl)
-- build(deps): bump github.com/spf13/cobra from 1.6.1 to 1.7.0 (49699333+dependabot[bot])
-- workflow: Ignore govulncheck failures (bcl)
-- build(deps): bump actions/setup-go from 3 to 4 (49699333+dependabot[bot])
-- workflow: Switch to testing on go 1.18, 1.19, 1.20 (bcl)
-- maint: Update to use go v1.18 by default (bcl)
-- build(deps): bump github.com/stretchr/testify from 1.8.1 to 1.8.2 (49699333+dependabot[bot])
-- spec: Require createrepo_c for weldr-client-tests package (bcl)
-- Build weldr-client-tests by default (bcl)
-- spec: migrate the license field to SPDX (ondrej)
+* Thu Jun 08 2023 Brian C. Lane <bcl@redhat.com> - 35.11-1
+- New release: 35.11 (bcl)
+- build(deps): bump github.com/BurntSushi/toml from 1.3.0 to 1.3.1 (49699333+dependabot[bot])
+- build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 (49699333+dependabot[bot])
+- CI: Update terraform hash (bcl)
+- build(deps): bump github.com/BurntSushi/toml from 1.2.1 to 1.3.0 (49699333+dependabot[bot])
+- build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 (49699333+dependabot[bot])
+- docs: fix typo/formatting in HACKING.md (idiez)
+- Add release creation documentation (bcl)
\ No newline at end of file

From ecb3e49acafae58939f3e26d46a07f61db9d6f0e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 18:07:24 +0000
Subject: [PATCH 19/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 0c581b1..ea453e9 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.11
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,6 +130,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jun 08 2023 Brian C. Lane <bcl@redhat.com> - 35.11-1
 - New release: 35.11 (bcl)
 - build(deps): bump github.com/BurntSushi/toml from 1.3.0 to 1.3.1 (49699333+dependabot[bot])

From e305c075e9f96e166f17bd517801c701266709b5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 08:37:27 +0000
Subject: [PATCH 20/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index ea453e9..32c3d91 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.11
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,6 +130,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 4795194446b22609aa6222d57b046d9e90a9e625 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Sun, 11 Feb 2024 23:41:48 +0000
Subject: [PATCH 21/33] Rebuild for golang 1.22.0

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 32c3d91..f9ba3b3 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.11
-Release:   3%{?dist}
+Release:   4%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,6 +130,9 @@ composer-cli package.
 
 
 %changelog
+* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 35.11-4
+- Rebuild for golang 1.22.0
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e94fa8e5b15ebaa812babed1643bbb6ae88217e8 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 19 Feb 2024 15:00:06 -0800
Subject: [PATCH 22/33] - New release: 35.12 (bcl) - Update documentation urls
 for new locations (bcl) - workflows: Stop using golint (bcl) - workflows: Add
 Go 1.21 and 1.22 to test matrix (bcl) - workflows: Update to golangci-lint
 1.56.2 (bcl) - weldr: go fmt changes to a couple comments (bcl) - Go: Switch
 to go 1.19 (bcl) - weldr: Update ostree test for parentid with no url (bcl) -
 build(deps): bump actions/setup-go from 4 to 5 (49699333+dependabot[bot]) -
 Makefile: Turn off seccomp for build-in-podman (bcl) - build(deps): bump
 github.com/spf13/cobra from 1.7.0 to 1.8.0 (49699333+dependabot[bot]) -
 build(deps): bump actions/checkout from 3 to 4 (49699333+dependabot[bot]) -
 Actions: add workflow for marking and closing stale issues and PRs (thozza) -
 composer-cli: Update doc links (simon.steinbeiss) - build(deps): bump
 github.com/BurntSushi/toml from 1.3.1 to 1.3.2 (49699333+dependabot[bot])

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 38 ++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index f58c71c..b2c553c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@
 /weldr-client-35.10.tar.gz.asc
 /weldr-client-35.11.tar.gz
 /weldr-client-35.11.tar.gz.asc
+/weldr-client-35.12.tar.gz
+/weldr-client-35.12.tar.gz.asc
diff --git a/sources b/sources
index c5ae9d8..9b51b8e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.11.tar.gz) = 76b76ccc4b428c8618bcfc33674a39ecc77af655bc17a11ce0aac0d56610f554242d4febd214f7b107cfc5274704d15d503f5f106bafa74ca675c3b3d28d03e6
-SHA512 (weldr-client-35.11.tar.gz.asc) = bdd0f2b170d99ac0e451e120ed94cce81e688dd52df271d659af6abc8eee921776254056650c5cbd8256e668ddc42547df3ce3dac24eecf18e64a57defafa3ff
+SHA512 (weldr-client-35.12.tar.gz) = ae3da43140ecd237c9ba7ce35b1f93d38672042725065149f56f9caf8b0c9f6b6210240a302782b99b499d82027c8e59012d74043e8e7a72513b3f10355d9643
+SHA512 (weldr-client-35.12.tar.gz.asc) = 195e43981cd74789735119bd8cb8690d7e7e67994a4deff17cb3165fba4c3abcb786b7adeebfe15d4d54df5fd93a29c4c656248bba7062cb0fd93267b37ee01d
 SHA512 (gpg-117E8C168EFE3A7F.key) = e02b3598d3ccdf58a7f34d0e3129f08126bc07cfb0ff98ac96f3325a7612e4e13e0adc09ea68e57f1198181e864e108c1aae718cdbb115326abefd50e969a4fe
diff --git a/weldr-client.spec b/weldr-client.spec
index f9ba3b3..56101da 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.11
-Release:   4%{?dist}
+Version:   35.12
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,21 +130,19 @@ composer-cli package.
 
 
 %changelog
-* Sun Feb 11 2024 Maxwell G <maxwell@gtmx.me> - 35.11-4
-- Rebuild for golang 1.22.0
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 35.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 08 2023 Brian C. Lane <bcl@redhat.com> - 35.11-1
-- New release: 35.11 (bcl)
-- build(deps): bump github.com/BurntSushi/toml from 1.3.0 to 1.3.1 (49699333+dependabot[bot])
-- build(deps): bump github.com/stretchr/testify from 1.8.3 to 1.8.4 (49699333+dependabot[bot])
-- CI: Update terraform hash (bcl)
-- build(deps): bump github.com/BurntSushi/toml from 1.2.1 to 1.3.0 (49699333+dependabot[bot])
-- build(deps): bump github.com/stretchr/testify from 1.8.2 to 1.8.3 (49699333+dependabot[bot])
-- docs: fix typo/formatting in HACKING.md (idiez)
-- Add release creation documentation (bcl)
\ No newline at end of file
+* Mon Feb 19 2024 Brian C. Lane <bcl@redhat.com> - 35.12-1
+- New release: 35.12 (bcl)
+- Update documentation urls for new locations (bcl)
+- workflows: Stop using golint (bcl)
+- workflows: Add Go 1.21 and 1.22 to test matrix (bcl)
+- workflows: Update to golangci-lint 1.56.2 (bcl)
+- weldr: go fmt changes to a couple comments (bcl)
+- Go: Switch to go 1.19 (bcl)
+- weldr: Update ostree test for parentid with no url (bcl)
+- build(deps): bump actions/setup-go from 4 to 5 (49699333+dependabot[bot])
+- Makefile: Turn off seccomp for build-in-podman (bcl)
+- build(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (49699333+dependabot[bot])
+- build(deps): bump actions/checkout from 3 to 4 (49699333+dependabot[bot])
+- Actions: add workflow for marking and closing stale issues and PRs (thozza)
+- composer-cli: Update doc links (simon.steinbeiss)
+- build(deps): bump github.com/BurntSushi/toml from 1.3.1 to 1.3.2 (49699333+dependabot[bot])
\ No newline at end of file

From 8932c4155b00b5564bb4ebce761a2a72e9049324 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 7 Mar 2024 15:02:28 -0800
Subject: [PATCH 23/33] - New release: 35.13 (bcl) - HACKING.md: Reformat code
 blocks for docusaurus (simon.steinbeiss) - README: Update code block
 formatting and drop subtitle (simon.steinbeiss) - info: Add upload status to
 the output (bcl) - info: Fix display of blueprint packages with no version
 (bcl) - weldr: Add Stringer interface to Package (bcl) - compose: Add --wait
 options to start-ostree (bcl) - compose: Add --wait options to start command
 (bcl) - compose: Add compose wait command (bcl) - weldr: Add ComposeWait to
 wait for a compose to finish (bcl) - build(deps): bump
 github.com/stretchr/testify from 1.8.4 to 1.9.0 (49699333+dependabot[bot]) -
 CI: Drop SonarQube in favor of Snyk (jrusz)

---
 .gitignore        |  2 ++
 sources           |  4 ++--
 weldr-client.spec | 31 ++++++++++++++-----------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index b2c553c..4c3d173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@
 /weldr-client-35.11.tar.gz.asc
 /weldr-client-35.12.tar.gz
 /weldr-client-35.12.tar.gz.asc
+/weldr-client-35.13.tar.gz
+/weldr-client-35.13.tar.gz.asc
diff --git a/sources b/sources
index 9b51b8e..0efcbe6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.12.tar.gz) = ae3da43140ecd237c9ba7ce35b1f93d38672042725065149f56f9caf8b0c9f6b6210240a302782b99b499d82027c8e59012d74043e8e7a72513b3f10355d9643
-SHA512 (weldr-client-35.12.tar.gz.asc) = 195e43981cd74789735119bd8cb8690d7e7e67994a4deff17cb3165fba4c3abcb786b7adeebfe15d4d54df5fd93a29c4c656248bba7062cb0fd93267b37ee01d
+SHA512 (weldr-client-35.13.tar.gz) = e74eb2e11c5598c79198c804f2638219ed22be3fb1cc10be51197fa6a7bc45ddd7b1f0dd58f1e757f454e0a7acaac7110bfec012a67374d13294073e60981c53
+SHA512 (weldr-client-35.13.tar.gz.asc) = 432eaccd1626b1da29553afb070bea7c0f95c97fb82d060a67fcb35d018bfcc78c34eaebb9fbfb35c3615b921b77ea7d7af63c2df7ba9caf98593726944f206f
 SHA512 (gpg-117E8C168EFE3A7F.key) = e02b3598d3ccdf58a7f34d0e3129f08126bc07cfb0ff98ac96f3325a7612e4e13e0adc09ea68e57f1198181e864e108c1aae718cdbb115326abefd50e969a4fe
diff --git a/weldr-client.spec b/weldr-client.spec
index 56101da..a08aff9 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,7 +6,7 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.12
+Version:   35.13
 Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
@@ -130,19 +130,16 @@ composer-cli package.
 
 
 %changelog
-* Mon Feb 19 2024 Brian C. Lane <bcl@redhat.com> - 35.12-1
-- New release: 35.12 (bcl)
-- Update documentation urls for new locations (bcl)
-- workflows: Stop using golint (bcl)
-- workflows: Add Go 1.21 and 1.22 to test matrix (bcl)
-- workflows: Update to golangci-lint 1.56.2 (bcl)
-- weldr: go fmt changes to a couple comments (bcl)
-- Go: Switch to go 1.19 (bcl)
-- weldr: Update ostree test for parentid with no url (bcl)
-- build(deps): bump actions/setup-go from 4 to 5 (49699333+dependabot[bot])
-- Makefile: Turn off seccomp for build-in-podman (bcl)
-- build(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0 (49699333+dependabot[bot])
-- build(deps): bump actions/checkout from 3 to 4 (49699333+dependabot[bot])
-- Actions: add workflow for marking and closing stale issues and PRs (thozza)
-- composer-cli: Update doc links (simon.steinbeiss)
-- build(deps): bump github.com/BurntSushi/toml from 1.3.1 to 1.3.2 (49699333+dependabot[bot])
\ No newline at end of file
+* Thu Mar 07 2024 Brian C. Lane <bcl@redhat.com> - 35.13-1
+- New release: 35.13 (bcl)
+- HACKING.md: Reformat code blocks for docusaurus (simon.steinbeiss)
+- README: Update code block formatting and drop subtitle (simon.steinbeiss)
+- info: Add upload status to the output (bcl)
+- info: Fix display of blueprint packages with no version (bcl)
+- weldr: Add Stringer interface to Package (bcl)
+- compose: Add --wait options to start-ostree (bcl)
+- compose: Add --wait options to start command (bcl)
+- compose: Add compose wait command (bcl)
+- weldr: Add ComposeWait to wait for a compose to finish (bcl)
+- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (49699333+dependabot[bot])
+- CI: Drop SonarQube in favor of Snyk (jrusz)
\ No newline at end of file

From c28cc3505c99a38c51ca78766522427731e9f040 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 09:15:30 +0000
Subject: [PATCH 24/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index a08aff9..6a9f1ef 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.13
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,6 +130,9 @@ composer-cli package.
 
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 35.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Mar 07 2024 Brian C. Lane <bcl@redhat.com> - 35.13-1
 - New release: 35.13 (bcl)
 - HACKING.md: Reformat code blocks for docusaurus (simon.steinbeiss)

From 9a4c67bed5267993469446e8745555e475b0ddae Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Tue, 12 Nov 2024 10:20:54 -0800
Subject: [PATCH 25/33] - tests: Remove openstack (bcl) - readme: project links
 (lukas) - Makefile: implement "fully source containers" HMS-3883
 (florian.schueller) - README: fix anchor typo (florian.schueller) - README:
 fix compatibility with docusaurus (florian.schueller) - go.mod: Use go 1.21
 (bcl) - workflows: Use go 1.21.x for govuln tests (bcl) - build(deps): bump
 github.com/spf13/cobra from 1.8.0 to 1.8.1 (49699333+dependabot[bot]) -
 build(deps): bump github.com/BurntSushi/toml from 1.3.2 to 1.4.0
 (49699333+dependabot[bot]) - Makefile: dnf5 builddep accepts .spec files
 without --spec (bcl) - Containerfile: Install dnf5-plugins for builddep
 support (bcl) - bash: Add status show to bash completion (bcl) - go.mod: Use
 go 1.20 (bcl) - bash: Add wait command to bash completion (bcl)

---
 .gitignore        |  2 ++
 sources           |  6 +++---
 weldr-client.spec | 36 ++++++++++++++++++------------------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4c3d173..6478ce9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,5 @@
 /weldr-client-35.12.tar.gz.asc
 /weldr-client-35.13.tar.gz
 /weldr-client-35.13.tar.gz.asc
+/weldr-client-35.14.tar.gz
+/weldr-client-35.14.tar.gz.asc
diff --git a/sources b/sources
index 0efcbe6..953c1d2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.13.tar.gz) = e74eb2e11c5598c79198c804f2638219ed22be3fb1cc10be51197fa6a7bc45ddd7b1f0dd58f1e757f454e0a7acaac7110bfec012a67374d13294073e60981c53
-SHA512 (weldr-client-35.13.tar.gz.asc) = 432eaccd1626b1da29553afb070bea7c0f95c97fb82d060a67fcb35d018bfcc78c34eaebb9fbfb35c3615b921b77ea7d7af63c2df7ba9caf98593726944f206f
-SHA512 (gpg-117E8C168EFE3A7F.key) = e02b3598d3ccdf58a7f34d0e3129f08126bc07cfb0ff98ac96f3325a7612e4e13e0adc09ea68e57f1198181e864e108c1aae718cdbb115326abefd50e969a4fe
+SHA512 (weldr-client-35.14.tar.gz) = 9cfb2524b42a9e9ef46e22d90506d2081a3bd1c0bfc35e19a51d527a81ef11c909eced24343a3d65ac6dbc7601a14278094bc514a41a5e584bd3ec7ca03ec55b
+SHA512 (weldr-client-35.14.tar.gz.asc) = 0a808bacfc3abca065696e193ba244318e9b1baf727dfb2a3ae65b9496854d2fc063f1ddb68ad2d9f1774f8ce6203b1c93656b1fb85b5772e40286fbcb995651
+SHA512 (gpg-117E8C168EFE3A7F.key) = b5c5a30e2b7997af89f00f153930c03ef165ba4abef223db94818a42d536350622c21e581b6a9ebfb9e6476b8c8d84d4ea549d6c7990482315fd914f4544bcf2
diff --git a/weldr-client.spec b/weldr-client.spec
index 6a9f1ef..9926147 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.13
-Release:   2%{?dist}
+Version:   35.14
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,19 +130,19 @@ composer-cli package.
 
 
 %changelog
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 35.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Mar 07 2024 Brian C. Lane <bcl@redhat.com> - 35.13-1
-- New release: 35.13 (bcl)
-- HACKING.md: Reformat code blocks for docusaurus (simon.steinbeiss)
-- README: Update code block formatting and drop subtitle (simon.steinbeiss)
-- info: Add upload status to the output (bcl)
-- info: Fix display of blueprint packages with no version (bcl)
-- weldr: Add Stringer interface to Package (bcl)
-- compose: Add --wait options to start-ostree (bcl)
-- compose: Add --wait options to start command (bcl)
-- compose: Add compose wait command (bcl)
-- weldr: Add ComposeWait to wait for a compose to finish (bcl)
-- build(deps): bump github.com/stretchr/testify from 1.8.4 to 1.9.0 (49699333+dependabot[bot])
-- CI: Drop SonarQube in favor of Snyk (jrusz)
\ No newline at end of file
+* Tue Nov 12 2024 Brian C. Lane <bcl@redhat.com> - 35.14-1
+- New release: 35.14 (bcl)
+- tests: Remove openstack (bcl)
+- readme: project links (lukas)
+- Makefile: implement "fully source containers" HMS-3883 (florian.schueller)
+- README: fix anchor typo (florian.schueller)
+- README: fix compatibility with docusaurus (florian.schueller)
+- go.mod: Use go 1.21 (bcl)
+- workflows: Use go 1.21.x for govuln tests (bcl)
+- build(deps): bump github.com/spf13/cobra from 1.8.0 to 1.8.1 (49699333+dependabot[bot])
+- build(deps): bump github.com/BurntSushi/toml from 1.3.2 to 1.4.0 (49699333+dependabot[bot])
+- Makefile: dnf5 builddep accepts .spec files without --spec (bcl)
+- Containerfile: Install dnf5-plugins for builddep support (bcl)
+- bash: Add status show to bash completion (bcl)
+- go.mod: Use go 1.20 (bcl)
+- bash: Add wait command to bash completion (bcl)
\ No newline at end of file

From 6e6d05f0d15979a0950984598fcd021352c58f3f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 14:54:58 +0000
Subject: [PATCH 26/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 9926147..c80f9b0 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.14
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -130,6 +130,9 @@ composer-cli package.
 
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 35.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Tue Nov 12 2024 Brian C. Lane <bcl@redhat.com> - 35.14-1
 - New release: 35.14 (bcl)
 - tests: Remove openstack (bcl)

From 0ee2f84e8baebb10def189ba8ad5e17a26e445e6 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 27 Jan 2025 10:01:29 -0800
Subject: [PATCH 27/33] - Fix non-constant log strings   Resolves: rhbz#2341535

---
 0001-Fix-non-constant-log-strings.patch | 116 ++++++++++++++++++++++++
 weldr-client.spec                       |  11 ++-
 2 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 0001-Fix-non-constant-log-strings.patch

diff --git a/0001-Fix-non-constant-log-strings.patch b/0001-Fix-non-constant-log-strings.patch
new file mode 100644
index 0000000..092378f
--- /dev/null
+++ b/0001-Fix-non-constant-log-strings.patch
@@ -0,0 +1,116 @@
+From 4d588ce64de6f9b17c95820f65fed7781e028c13 Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl@redhat.com>
+Date: Mon, 27 Jan 2025 09:36:07 -0800
+Subject: [PATCH] Fix non-constant log strings
+
+go v1.24 will fail to build when non-constant strings are passed to the
+format field. Fix this now that that it doesn't become an issue when
+switching to v1.24
+---
+ cmd/composer-cli/blueprints/diff.go | 20 ++++++++++----------
+ cmd/composer-cli/root/root.go       |  2 +-
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/cmd/composer-cli/blueprints/diff.go b/cmd/composer-cli/blueprints/diff.go
+index 9b4f139..14299e2 100644
+--- a/cmd/composer-cli/blueprints/diff.go
++++ b/cmd/composer-cli/blueprints/diff.go
+@@ -43,24 +43,24 @@ func diff(cmd *cobra.Command, args []string) (rcErr error) {
+ 	if root.JSONOutput {
+ 		err := getBlueprintJSON(args[0], args[1])
+ 		if err != nil {
+-			return root.ExecutionError(cmd, err.Error())
++			return root.ExecutionError(cmd, "%s", err.Error())
+ 		}
+ 
+ 		err = getBlueprintJSON(args[0], args[2])
+ 		if err != nil {
+-			return root.ExecutionError(cmd, err.Error())
++			return root.ExecutionError(cmd, "%s", err.Error())
+ 		}
+ 		return nil
+ 	}
+ 
+ 	fromBlueprint, err := getBlueprint(args[0], args[1])
+ 	if err != nil {
+-		return root.ExecutionError(cmd, err.Error())
++		return root.ExecutionError(cmd, "%s", err.Error())
+ 	}
+ 
+ 	toBlueprint, err := getBlueprint(args[0], args[2])
+ 	if err != nil {
+-		return root.ExecutionError(cmd, err.Error())
++		return root.ExecutionError(cmd, "%s", err.Error())
+ 	}
+ 
+ 	// Everything after args[2] is passed to diff
+@@ -86,7 +86,7 @@ func getBlueprint(name, commit string) (string, error) {
+ 			return "", err
+ 		}
+ 		if resp != nil && !resp.Status {
+-			return "", fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
++			return "", fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
+ 		}
+ 		if len(bps) == 0 {
+ 			return "", fmt.Errorf("no blueprints")
+@@ -99,7 +99,7 @@ func getBlueprint(name, commit string) (string, error) {
+ 			return "", err
+ 		}
+ 		if len(resp) > 0 {
+-			return "", fmt.Errorf(resp[0].String())
++			return "", fmt.Errorf("%s", resp[0].String())
+ 		}
+ 		if len(bps) < 1 {
+ 			return "", fmt.Errorf("no blueprints")
+@@ -116,7 +116,7 @@ func getBlueprint(name, commit string) (string, error) {
+ 		return "", err
+ 	}
+ 	if resp != nil && !resp.Status {
+-		return "", fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
++		return "", fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
+ 	}
+ 	return bp, nil
+ }
+@@ -192,7 +192,7 @@ func getBlueprintJSON(name, commit string) error {
+ 			return err
+ 		}
+ 		if len(resp) > 0 {
+-			return fmt.Errorf(resp[0].String())
++			return fmt.Errorf("%s", resp[0].String())
+ 		}
+ 		if len(bps) == 0 {
+ 			return fmt.Errorf("no blueprints")
+@@ -205,7 +205,7 @@ func getBlueprintJSON(name, commit string) error {
+ 			return err
+ 		}
+ 		if len(resp) > 0 {
+-			return fmt.Errorf(resp[0].String())
++			return fmt.Errorf("%s", resp[0].String())
+ 		}
+ 		if len(bps) < 1 {
+ 			return fmt.Errorf("no blueprints")
+@@ -222,7 +222,7 @@ func getBlueprintJSON(name, commit string) error {
+ 		return err
+ 	}
+ 	if resp != nil && !resp.Status {
+-		return fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
++		return fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
+ 	}
+ 	return nil
+ }
+diff --git a/cmd/composer-cli/root/root.go b/cmd/composer-cli/root/root.go
+index ca98c72..9e4d1c0 100644
+--- a/cmd/composer-cli/root/root.go
++++ b/cmd/composer-cli/root/root.go
+@@ -180,7 +180,7 @@ func ExecutionError(cmd *cobra.Command, format string, a ...interface{}) error {
+ 	}
+ 	cmd.SilenceErrors = true // cobra will not print errors returned from commands after this
+ 	cmd.SilenceUsage = true  // cobra will not print usage on errors after this
+-	return fmt.Errorf(s)
++	return fmt.Errorf("%s", s)
+ }
+ 
+ // ExecutionErrors prints a list of errors to stderr, then calls ExecutionError
+-- 
+2.48.1
+
diff --git a/weldr-client.spec b/weldr-client.spec
index c80f9b0..96954e1 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.14
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -20,6 +20,8 @@ Source1:   https://github.com/osbuild/weldr-client/releases/download/v%{version}
 Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key
 %endif
 
+Patch0001: 0001-Fix-non-constant-log-strings.patch
+
 Obsoletes: composer-cli < 35.0
 Provides: composer-cli = %{version}-%{release}
 
@@ -50,6 +52,7 @@ Command line utility to control osbuild-composer
 %forgeautosetup -p1
 %else
 %goprep
+%autopatch -p1
 %endif
 
 %build
@@ -130,6 +133,10 @@ composer-cli package.
 
 
 %changelog
+* Mon Jan 27 2025 Brian C. Lane <bcl@redhat.com> - 35.14-3
+- Fix non-constant log strings
+  Resolves: rhbz#2341535
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 35.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
@@ -148,4 +155,4 @@ composer-cli package.
 - Containerfile: Install dnf5-plugins for builddep support (bcl)
 - bash: Add status show to bash completion (bcl)
 - go.mod: Use go 1.20 (bcl)
-- bash: Add wait command to bash completion (bcl)
\ No newline at end of file
+- bash: Add wait command to bash completion (bcl)

From 2c752bf449f425f4c85a30f8e1d66f846535f171 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 20:22:13 +0000
Subject: [PATCH 28/33] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 96954e1..975efc7 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.14
-Release:   3%{?dist}
+Release:   4%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -133,6 +133,9 @@ composer-cli package.
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 35.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Mon Jan 27 2025 Brian C. Lane <bcl@redhat.com> - 35.14-3
 - Fix non-constant log strings
   Resolves: rhbz#2341535

From 7d46e8107d671aa54b4d3ddcff7a8084e0fba5e7 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 14 Aug 2025 08:52:00 -0700
Subject: [PATCH 29/33] - golangci: Disable linting for a few things (bcl) -
 test: Remove unneeded fmt.Sprintf (bcl) - lint: Clean up lint errcheck errors
 (bcl) - workflows: Update to golangci-lint 2.3.0 (bcl) - workflows: Update to
 use go 1.23 and drop 1.21 and 1.22 (bcl) - GHA: enable the stale action to
 delete its saved state (thozza) - composer-cli: Add cloudapi support to
 delete command (bcl) - cloud: Add DeleteCompose function and tests (bcl) -
 cloud: Add DeleteRaw function and tests (bcl) - tests: Fix
 TestComposeInfoCloud (bcl) - cloud: Handle unexpected status codes (bcl) -
 composer-cli: Add cloudapi support to compose image command (bcl) - cloud:
 Add ComposeImagePath function (bcl) - cloud: Add GetFilePath function to
 download an image file (bcl) - common: Move part of GetFilePath into
 common.SaveResponseBodyToFile (bcl) - composer-cli: Add size to the compose
 status cloud command (bcl) - composer-cli: Add support for more cloudapi
 detail to compose list (bcl) - composer-cli: Add cloudapi support to the
 compose info command (bcl) - apischema: Add UploadTypes function to
 ComposeMetadataV1 (bcl) - cloud: Add GetComposeMetadata function (bcl) -
 common: Move blueprint struct to common (bcl) - cloud: Move status mapping
 into a function (bcl) - apischema: Move ComposeResponseV1 to apischema (bcl)
 - apischema: Move Status to apischema (bcl) - apischema: Move PackageDetails
 to apischema (bcl) - apischema: Move ComposeInfo to apischema (bcl) -
 apischema: Add a common location to define cloudapi structs (bcl) -
 build(deps): bump github.com/BurntSushi/toml from 1.4.0 to 1.5.0
 (49699333+dependabot[bot]) - compose: Add listing cloud composes to the
 status command (bcl) - compose: Add listing cloud composes to the list
 command (bcl) - cloud: Add test for ListComposes (bcl) - cloud: Implement
 ListComposes to return cloudapi compose info (bcl) - projects: Add cloudapi
 support to depsolve command (bcl) - blueprints: Add cloudapi support for
 depsolving local blueprint files (bcl) - cloud: Add DepsolveBlueprint
 function (bcl) - depsolve: Move parsing of weldr response into apischema
 (bcl) - depsolve: Use common.PackageNEVRA (bcl) - README.md: align with
 image-builder-cli (florian.schueller) - projects: Add cloudapi support to the
 list command (bcl) - projects: Add cloudapi support for project info command
 (bcl) - cloud: Add SearchPackages function (bcl) - composer-cli: Add a
 --weldr-only flag (bcl) - tests: OSTree does not support the qcow2 image type
 (bcl) - compose: Add cloudapi support to the compose types command (bcl) -
 cloud: Add ComposeTypes function to return image types (bcl) - common: Add
 SortedMapKeys helper (bcl) - distros: Add cloudapi support to the list
 command (bcl) - cloud: Add test for ListDistros (bcl) - cloud: Add
 ListDistros function to return distro names (bcl) -
 github/workflows/pr_best_practices: initial version (florian.schueller) -
 common: PackageNEVRA JSON epoch field can be string or int (bcl) - common:
 Move PackageNEVRA to common (bcl) - common: Move GetHostDistroName to common
 (bcl) - common: Refactor GetContentFilename (bcl) - common: Refactor cloud
 common to use internal common functions (bcl) - common: Create a common
 package to share functions (bcl) - weldr: Function to check APIResponse for
 an error ID (bcl) - build(deps): bump github.com/spf13/cobra from 1.8.1 to
 1.9.1 (49699333+dependabot[bot]) - cloud: Make the test bool private (bcl) -
 compose: Return an error when opening a file (bcl) - cloud: Add tests for
 ComposeWait function (bcl) - compose: Add cloud API --wait to start command
 (bcl) - compose: Add support for cloud API UUIDs to compose wait (bcl) -
 cloud: Add ComposeWait function (bcl) - cloud: Add test for ComposeInfo (bcl)
 - cloud: Add ComposeInfo function (bcl) - compose: Remove redundant 'Error'
 from error strings in start (bcl) - compose: Add upload handling for cloud
 (bcl) - cloud: Add support for passing upload options (bcl) - compose: Add
 ability to use a local blueprint to start a compose (bcl) - cloud: Add
 StartCompose function (bcl) - cloud: Add ServerStatus function (bcl) -
 status: Add cloudapi status to show command (bcl) - Makefile: Pass VERSION
 into build container (bcl) - cmd: Add cloudapi client (bcl) - cloud: Add
 basic Client functions for cloud api (bcl) - go.mod: Upgrade modules to
 current versions (bcl) - go.mod: Bump go version to 1.22.6 (bcl) - tools: Use
 go toolbox in prepare-source.sh (bcl) - Fix non-constant log strings (bcl) -
 Bump testify version to 1.10.0 (bcl)

---
 .gitignore        |   2 +
 sources           |   6 +--
 weldr-client.spec | 116 +++++++++++++++++++++++++++++++++-------------
 3 files changed, 90 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6478ce9..de762f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@
 /weldr-client-35.13.tar.gz.asc
 /weldr-client-35.14.tar.gz
 /weldr-client-35.14.tar.gz.asc
+/weldr-client-36.0.tar.gz
+/weldr-client-36.0.tar.gz.asc
diff --git a/sources b/sources
index 953c1d2..7ba8ab8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-35.14.tar.gz) = 9cfb2524b42a9e9ef46e22d90506d2081a3bd1c0bfc35e19a51d527a81ef11c909eced24343a3d65ac6dbc7601a14278094bc514a41a5e584bd3ec7ca03ec55b
-SHA512 (weldr-client-35.14.tar.gz.asc) = 0a808bacfc3abca065696e193ba244318e9b1baf727dfb2a3ae65b9496854d2fc063f1ddb68ad2d9f1774f8ce6203b1c93656b1fb85b5772e40286fbcb995651
-SHA512 (gpg-117E8C168EFE3A7F.key) = b5c5a30e2b7997af89f00f153930c03ef165ba4abef223db94818a42d536350622c21e581b6a9ebfb9e6476b8c8d84d4ea549d6c7990482315fd914f4544bcf2
+SHA512 (weldr-client-36.0.tar.gz) = 4d81db98b61c3a795af7b1b9a917e71b7c8e2f7c2e7d620771ba7c1c4f7a89b78e3d7802d98f0cfbfe7621ea1eeb06a01b0e6217a20f3b182237e941d283a135
+SHA512 (weldr-client-36.0.tar.gz.asc) = 674054a6c2d4e33d72fdf301de5bf5e8d9c380bbf2f10660337f287f2b18b1cd53aada8e30264bbf29040c69b50997b22de9a9815dc8d2fbf0832bd935aa2c5e
+SHA512 (gpg-117E8C168EFE3A7F.key) = 71334857bad76d3ae4ac7f7def6e41a2830bbed85462c974a00c27998abdf03ce07bdab2574fb99cd5aab0041b48e673565b9f2bf4f7a467bc835b084a6e848e
diff --git a/weldr-client.spec b/weldr-client.spec
index 975efc7..622179e 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   35.14
-Release:   4%{?dist}
+Version:   36.0
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -20,8 +20,6 @@ Source1:   https://github.com/osbuild/weldr-client/releases/download/v%{version}
 Source2:   https://keys.openpgp.org/vks/v1/by-fingerprint/117E8C168EFE3A7F#/gpg-117E8C168EFE3A7F.key
 %endif
 
-Patch0001: 0001-Fix-non-constant-log-strings.patch
-
 Obsoletes: composer-cli < 35.0
 Provides: composer-cli = %{version}-%{release}
 
@@ -52,7 +50,6 @@ Command line utility to control osbuild-composer
 %forgeautosetup -p1
 %else
 %goprep
-%autopatch -p1
 %endif
 
 %build
@@ -133,29 +130,86 @@ composer-cli package.
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 35.14-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Mon Jan 27 2025 Brian C. Lane <bcl@redhat.com> - 35.14-3
-- Fix non-constant log strings
-  Resolves: rhbz#2341535
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 35.14-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Nov 12 2024 Brian C. Lane <bcl@redhat.com> - 35.14-1
-- New release: 35.14 (bcl)
-- tests: Remove openstack (bcl)
-- readme: project links (lukas)
-- Makefile: implement "fully source containers" HMS-3883 (florian.schueller)
-- README: fix anchor typo (florian.schueller)
-- README: fix compatibility with docusaurus (florian.schueller)
-- go.mod: Use go 1.21 (bcl)
-- workflows: Use go 1.21.x for govuln tests (bcl)
-- build(deps): bump github.com/spf13/cobra from 1.8.0 to 1.8.1 (49699333+dependabot[bot])
-- build(deps): bump github.com/BurntSushi/toml from 1.3.2 to 1.4.0 (49699333+dependabot[bot])
-- Makefile: dnf5 builddep accepts .spec files without --spec (bcl)
-- Containerfile: Install dnf5-plugins for builddep support (bcl)
-- bash: Add status show to bash completion (bcl)
-- go.mod: Use go 1.20 (bcl)
-- bash: Add wait command to bash completion (bcl)
+* Thu Aug 14 2025 Brian C. Lane <bcl@redhat.com> - 36.0-1
+- New release: 36.0 (bcl)
+- golangci: Disable linting for a few things (bcl)
+- test: Remove unneeded fmt.Sprintf (bcl)
+- lint: Clean up lint errcheck errors (bcl)
+- workflows: Update to golangci-lint 2.3.0 (bcl)
+- workflows: Update to use go 1.23 and drop 1.21 and 1.22 (bcl)
+- GHA: enable the stale action to delete its saved state (thozza)
+- composer-cli: Add cloudapi support to delete command (bcl)
+- cloud: Add DeleteCompose function and tests (bcl)
+- cloud: Add DeleteRaw function and tests (bcl)
+- tests: Fix TestComposeInfoCloud (bcl)
+- cloud: Handle unexpected status codes (bcl)
+- composer-cli: Add cloudapi support to compose image command (bcl)
+- cloud: Add ComposeImagePath function (bcl)
+- cloud: Add GetFilePath function to download an image file (bcl)
+- common: Move part of GetFilePath into common.SaveResponseBodyToFile (bcl)
+- composer-cli: Add size to the compose status cloud command (bcl)
+- composer-cli: Add support for more cloudapi detail to compose list (bcl)
+- composer-cli: Add cloudapi support to the compose info command (bcl)
+- apischema: Add UploadTypes function to ComposeMetadataV1 (bcl)
+- cloud: Add GetComposeMetadata function (bcl)
+- common: Move blueprint struct to common (bcl)
+- cloud: Move status mapping into a function (bcl)
+- apischema: Move ComposeResponseV1 to apischema (bcl)
+- apischema: Move Status to apischema (bcl)
+- apischema: Move PackageDetails to apischema (bcl)
+- apischema: Move ComposeInfo to apischema (bcl)
+- apischema: Add a common location to define cloudapi structs (bcl)
+- build(deps): bump github.com/BurntSushi/toml from 1.4.0 to 1.5.0 (49699333+dependabot[bot])
+- compose: Add listing cloud composes to the status command (bcl)
+- compose: Add listing cloud composes to the list command (bcl)
+- cloud: Add test for ListComposes (bcl)
+- cloud: Implement ListComposes to return cloudapi compose info (bcl)
+- projects: Add cloudapi support to depsolve command (bcl)
+- blueprints: Add cloudapi support for depsolving local blueprint files (bcl)
+- cloud: Add DepsolveBlueprint function (bcl)
+- depsolve: Move parsing of weldr response into apischema (bcl)
+- depsolve: Use common.PackageNEVRA (bcl)
+- README.md: align with image-builder-cli (florian.schueller)
+- projects: Add cloudapi support to the list command (bcl)
+- projects: Add cloudapi support for project info command (bcl)
+- cloud: Add SearchPackages function (bcl)
+- composer-cli: Add a --weldr-only flag (bcl)
+- tests: OSTree does not support the qcow2 image type (bcl)
+- compose: Add cloudapi support to the compose types command (bcl)
+- cloud: Add ComposeTypes function to return image types (bcl)
+- common: Add SortedMapKeys helper (bcl)
+- distros: Add cloudapi support to the list command (bcl)
+- cloud: Add test for ListDistros (bcl)
+- cloud: Add ListDistros function to return distro names (bcl)
+- github/workflows/pr_best_practices: initial version (florian.schueller)
+- common: PackageNEVRA JSON epoch field can be string or int (bcl)
+- common: Move PackageNEVRA to common (bcl)
+- common: Move GetHostDistroName to common (bcl)
+- common: Refactor GetContentFilename (bcl)
+- common: Refactor cloud common to use internal common functions (bcl)
+- common: Create a common package to share functions (bcl)
+- weldr: Function to check APIResponse for an error ID (bcl)
+- build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (49699333+dependabot[bot])
+- cloud: Make the test bool private (bcl)
+- compose: Return an error when opening a file (bcl)
+- cloud: Add tests for ComposeWait function (bcl)
+- compose: Add cloud API --wait to start command (bcl)
+- compose: Add support for cloud API UUIDs to compose wait (bcl)
+- cloud: Add ComposeWait function (bcl)
+- cloud: Add test for ComposeInfo (bcl)
+- cloud: Add ComposeInfo function (bcl)
+- compose: Remove redundant 'Error' from error strings in start (bcl)
+- compose: Add upload handling for cloud (bcl)
+- cloud: Add support for passing upload options (bcl)
+- compose: Add ability to use a local blueprint to start a compose (bcl)
+- cloud: Add StartCompose function (bcl)
+- cloud: Add ServerStatus function (bcl)
+- status: Add cloudapi status to show command (bcl)
+- Makefile: Pass VERSION into build container (bcl)
+- cmd: Add cloudapi client (bcl)
+- cloud: Add basic Client functions for cloud api (bcl)
+- go.mod: Upgrade modules to current versions (bcl)
+- go.mod: Bump go version to 1.22.6 (bcl)
+- tools: Use go toolbox in prepare-source.sh (bcl)
+- Fix non-constant log strings (bcl)
+- Bump testify version to 1.10.0 (bcl)
\ No newline at end of file

From c2c99826af9f99e9c5cbc550d275679e0beeccb6 Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 14 Aug 2025 09:43:28 -0700
Subject: [PATCH 30/33] tests: Skip checking arch when testing sent body

Patch the tests to fix build failures on non-x86_64 arches.
---
 0001-Fix-non-constant-log-strings.patch       | 116 ------------------
 ...checking-arch-when-testing-sent-body.patch |  48 ++++++++
 weldr-client.spec                             |   5 +-
 3 files changed, 52 insertions(+), 117 deletions(-)
 delete mode 100644 0001-Fix-non-constant-log-strings.patch
 create mode 100644 0001-tests-Skip-checking-arch-when-testing-sent-body.patch

diff --git a/0001-Fix-non-constant-log-strings.patch b/0001-Fix-non-constant-log-strings.patch
deleted file mode 100644
index 092378f..0000000
--- a/0001-Fix-non-constant-log-strings.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 4d588ce64de6f9b17c95820f65fed7781e028c13 Mon Sep 17 00:00:00 2001
-From: "Brian C. Lane" <bcl@redhat.com>
-Date: Mon, 27 Jan 2025 09:36:07 -0800
-Subject: [PATCH] Fix non-constant log strings
-
-go v1.24 will fail to build when non-constant strings are passed to the
-format field. Fix this now that that it doesn't become an issue when
-switching to v1.24
----
- cmd/composer-cli/blueprints/diff.go | 20 ++++++++++----------
- cmd/composer-cli/root/root.go       |  2 +-
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/cmd/composer-cli/blueprints/diff.go b/cmd/composer-cli/blueprints/diff.go
-index 9b4f139..14299e2 100644
---- a/cmd/composer-cli/blueprints/diff.go
-+++ b/cmd/composer-cli/blueprints/diff.go
-@@ -43,24 +43,24 @@ func diff(cmd *cobra.Command, args []string) (rcErr error) {
- 	if root.JSONOutput {
- 		err := getBlueprintJSON(args[0], args[1])
- 		if err != nil {
--			return root.ExecutionError(cmd, err.Error())
-+			return root.ExecutionError(cmd, "%s", err.Error())
- 		}
- 
- 		err = getBlueprintJSON(args[0], args[2])
- 		if err != nil {
--			return root.ExecutionError(cmd, err.Error())
-+			return root.ExecutionError(cmd, "%s", err.Error())
- 		}
- 		return nil
- 	}
- 
- 	fromBlueprint, err := getBlueprint(args[0], args[1])
- 	if err != nil {
--		return root.ExecutionError(cmd, err.Error())
-+		return root.ExecutionError(cmd, "%s", err.Error())
- 	}
- 
- 	toBlueprint, err := getBlueprint(args[0], args[2])
- 	if err != nil {
--		return root.ExecutionError(cmd, err.Error())
-+		return root.ExecutionError(cmd, "%s", err.Error())
- 	}
- 
- 	// Everything after args[2] is passed to diff
-@@ -86,7 +86,7 @@ func getBlueprint(name, commit string) (string, error) {
- 			return "", err
- 		}
- 		if resp != nil && !resp.Status {
--			return "", fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
-+			return "", fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
- 		}
- 		if len(bps) == 0 {
- 			return "", fmt.Errorf("no blueprints")
-@@ -99,7 +99,7 @@ func getBlueprint(name, commit string) (string, error) {
- 			return "", err
- 		}
- 		if len(resp) > 0 {
--			return "", fmt.Errorf(resp[0].String())
-+			return "", fmt.Errorf("%s", resp[0].String())
- 		}
- 		if len(bps) < 1 {
- 			return "", fmt.Errorf("no blueprints")
-@@ -116,7 +116,7 @@ func getBlueprint(name, commit string) (string, error) {
- 		return "", err
- 	}
- 	if resp != nil && !resp.Status {
--		return "", fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
-+		return "", fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
- 	}
- 	return bp, nil
- }
-@@ -192,7 +192,7 @@ func getBlueprintJSON(name, commit string) error {
- 			return err
- 		}
- 		if len(resp) > 0 {
--			return fmt.Errorf(resp[0].String())
-+			return fmt.Errorf("%s", resp[0].String())
- 		}
- 		if len(bps) == 0 {
- 			return fmt.Errorf("no blueprints")
-@@ -205,7 +205,7 @@ func getBlueprintJSON(name, commit string) error {
- 			return err
- 		}
- 		if len(resp) > 0 {
--			return fmt.Errorf(resp[0].String())
-+			return fmt.Errorf("%s", resp[0].String())
- 		}
- 		if len(bps) < 1 {
- 			return fmt.Errorf("no blueprints")
-@@ -222,7 +222,7 @@ func getBlueprintJSON(name, commit string) error {
- 		return err
- 	}
- 	if resp != nil && !resp.Status {
--		return fmt.Errorf(strings.Join(resp.AllErrors(), ", "))
-+		return fmt.Errorf("%s", strings.Join(resp.AllErrors(), ", "))
- 	}
- 	return nil
- }
-diff --git a/cmd/composer-cli/root/root.go b/cmd/composer-cli/root/root.go
-index ca98c72..9e4d1c0 100644
---- a/cmd/composer-cli/root/root.go
-+++ b/cmd/composer-cli/root/root.go
-@@ -180,7 +180,7 @@ func ExecutionError(cmd *cobra.Command, format string, a ...interface{}) error {
- 	}
- 	cmd.SilenceErrors = true // cobra will not print errors returned from commands after this
- 	cmd.SilenceUsage = true  // cobra will not print usage on errors after this
--	return fmt.Errorf(s)
-+	return fmt.Errorf("%s", s)
- }
- 
- // ExecutionErrors prints a list of errors to stderr, then calls ExecutionError
--- 
-2.48.1
-
diff --git a/0001-tests-Skip-checking-arch-when-testing-sent-body.patch b/0001-tests-Skip-checking-arch-when-testing-sent-body.patch
new file mode 100644
index 0000000..affb1aa
--- /dev/null
+++ b/0001-tests-Skip-checking-arch-when-testing-sent-body.patch
@@ -0,0 +1,48 @@
+From 6815aa4a2a0b2bd376d0f6e072580a9c60086e3e Mon Sep 17 00:00:00 2001
+From: "Brian C. Lane" <bcl@redhat.com>
+Date: Thu, 14 Aug 2025 09:26:25 -0700
+Subject: [PATCH] tests: Skip checking arch when testing sent body
+
+The host architecture is included in the body of the request, skip
+checking for the specific arch in order to keep the tests architecture
+independent.
+
+Related: RHEL-60137
+---
+ cmd/composer-cli/projects/info_test.go | 4 +++-
+ cmd/composer-cli/projects/list_test.go | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/cmd/composer-cli/projects/info_test.go b/cmd/composer-cli/projects/info_test.go
+index 3f9a85f..dd2a78c 100644
+--- a/cmd/composer-cli/projects/info_test.go
++++ b/cmd/composer-cli/projects/info_test.go
+@@ -457,7 +457,9 @@ func TestCmdProjectsInfoCloud(t *testing.T) {
+ 	sentBody, err := io.ReadAll(mcc.Req.Body)
+ 	assert.Nil(t, mcc.Req.Body.Close())
+ 	require.Nil(t, err)
+-	assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["tmux"]}`)
++	// NOTE: sentBody also contains arch specific architecture, skip checking that.
++	assert.Contains(t, string(sentBody), `"distribution":"homer"`)
++	assert.Contains(t, string(sentBody), `"packages":["tmux"]`)
+ 	assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type"))
+ 	assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path)
+ }
+diff --git a/cmd/composer-cli/projects/list_test.go b/cmd/composer-cli/projects/list_test.go
+index b809224..386b793 100644
+--- a/cmd/composer-cli/projects/list_test.go
++++ b/cmd/composer-cli/projects/list_test.go
+@@ -363,7 +363,9 @@ func TestCmdProjectsListCloud(t *testing.T) {
+ 	sentBody, err := io.ReadAll(mcc.Req.Body)
+ 	assert.Nil(t, mcc.Req.Body.Close())
+ 	require.Nil(t, err)
+-	assert.Contains(t, string(sentBody), `{"distribution":"homer","architecture":"x86_64","packages":["*"]}`)
++	// NOTE: sentBody also contains arch specific architecture, skip checking that.
++	assert.Contains(t, string(sentBody), `"distribution":"homer"`)
++	assert.Contains(t, string(sentBody), `"packages":["*"]`)
+ 	assert.Equal(t, "application/json", mcc.Req.Header.Get("Content-Type"))
+ 	assert.Equal(t, "/api/image-builder-composer/v2/search/packages", mcc.Req.URL.Path)
+ }
+-- 
+2.50.1
+
diff --git a/weldr-client.spec b/weldr-client.spec
index 622179e..359d44b 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -38,6 +38,7 @@ BuildRequires: git-core
 BuildRequires: make
 BuildRequires: gnupg2
 
+Patch0001: 0001-tests-Skip-checking-arch-when-testing-sent-body.patch
 
 %description
 Command line utility to control osbuild-composer
@@ -50,6 +51,7 @@ Command line utility to control osbuild-composer
 %forgeautosetup -p1
 %else
 %goprep
+%autopatch -p1
 %endif
 
 %build
@@ -131,6 +133,7 @@ composer-cli package.
 
 %changelog
 * Thu Aug 14 2025 Brian C. Lane <bcl@redhat.com> - 36.0-1
+- tests: Skip checking arch when testing sent body
 - New release: 36.0 (bcl)
 - golangci: Disable linting for a few things (bcl)
 - test: Remove unneeded fmt.Sprintf (bcl)
@@ -212,4 +215,4 @@ composer-cli package.
 - go.mod: Bump go version to 1.22.6 (bcl)
 - tools: Use go toolbox in prepare-source.sh (bcl)
 - Fix non-constant log strings (bcl)
-- Bump testify version to 1.10.0 (bcl)
\ No newline at end of file
+- Bump testify version to 1.10.0 (bcl)

From 77a093fe28d00f984bd6734cef97666cecb18306 Mon Sep 17 00:00:00 2001
From: Maxwell G <maxwell@gtmx.me>
Date: Fri, 15 Aug 2025 18:46:17 -0500
Subject: [PATCH 31/33] Rebuild for golang-1.25.0

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index 359d44b..b9bbadb 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   36.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -132,6 +132,9 @@ composer-cli package.
 
 
 %changelog
+* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 36.0-2
+- Rebuild for golang-1.25.0
+
 * Thu Aug 14 2025 Brian C. Lane <bcl@redhat.com> - 36.0-1
 - tests: Skip checking arch when testing sent body
 - New release: 36.0 (bcl)

From 07d97f62965226b5945a41baa7ae37fb2b6fd8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
Date: Fri, 10 Oct 2025 15:15:19 +0200
Subject: [PATCH 32/33] rebuild

---
 weldr-client.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/weldr-client.spec b/weldr-client.spec
index b9bbadb..ca2171d 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   36.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -132,6 +132,9 @@ composer-cli package.
 
 
 %changelog
+* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 36.0-3
+- rebuild
+
 * Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 36.0-2
 - Rebuild for golang-1.25.0
 

From 27c31269756f42bb6cf7a62c04aa0b9e0b49573b Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Wed, 15 Oct 2025 10:53:41 -0700
Subject: [PATCH 33/33] - build(deps): bump actions/setup-go from 5 to 6
 (49699333+dependabot[bot]) - build(deps): bump github.com/spf13/cobra from
 1.9.1 to 1.10.1 (49699333+dependabot[bot]) - test: iot-qcow2-image does not
 support packages (bcl) - test: qcow2 renamed to server-qcow2 (bcl) -
 build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1
 (49699333+dependabot[bot]) - build(deps): bump actions/checkout from 4 to 5
 (49699333+dependabot[bot]) - tests: Use current host arch in info and list
 tests (bcl)

---
 .gitignore        |   2 +
 sources           |   6 +--
 weldr-client.spec | 105 +++++-----------------------------------------
 3 files changed, 16 insertions(+), 97 deletions(-)

diff --git a/.gitignore b/.gitignore
index de762f4..62ae47b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
 /weldr-client-35.14.tar.gz.asc
 /weldr-client-36.0.tar.gz
 /weldr-client-36.0.tar.gz.asc
+/weldr-client-36.1.tar.gz
+/weldr-client-36.1.tar.gz.asc
diff --git a/sources b/sources
index 7ba8ab8..9a05ef2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (weldr-client-36.0.tar.gz) = 4d81db98b61c3a795af7b1b9a917e71b7c8e2f7c2e7d620771ba7c1c4f7a89b78e3d7802d98f0cfbfe7621ea1eeb06a01b0e6217a20f3b182237e941d283a135
-SHA512 (weldr-client-36.0.tar.gz.asc) = 674054a6c2d4e33d72fdf301de5bf5e8d9c380bbf2f10660337f287f2b18b1cd53aada8e30264bbf29040c69b50997b22de9a9815dc8d2fbf0832bd935aa2c5e
-SHA512 (gpg-117E8C168EFE3A7F.key) = 71334857bad76d3ae4ac7f7def6e41a2830bbed85462c974a00c27998abdf03ce07bdab2574fb99cd5aab0041b48e673565b9f2bf4f7a467bc835b084a6e848e
+SHA512 (weldr-client-36.1.tar.gz) = 52bac9879b73e3137d434a9c46a2914e0446ed63db14c9176cbd2a47aaf10a757a905a138401208958631237d354a7689035fd5a68297720431b212151eabd4d
+SHA512 (weldr-client-36.1.tar.gz.asc) = 0d0fd65355356aaac2eb8052c182f619d8d7da5c6af164d7b3da97b2fc0b4435d6e4cff2b81914e99e8f094a518432dd0b769e28fba4c90b8a9453326d6b3f1a
+SHA512 (gpg-117E8C168EFE3A7F.key) = cbbf218fe4427bd16f64b60cafd8c98bc3b073c25cfe2c19f03405ebfbf88ac05f0a3fa4e44afbbc514616b426008bc1e76b4e3ea49825a6ece4ad63638bb52b
diff --git a/weldr-client.spec b/weldr-client.spec
index ca2171d..82def08 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -6,8 +6,8 @@
 %global goipath         github.com/osbuild/weldr-client/v2
 
 Name:      weldr-client
-Version:   36.0
-Release:   3%{?dist}
+Version:   36.1
+Release:   1%{?dist}
 # Upstream license specification: Apache-2.0
 License:   Apache-2.0
 Summary:   Command line utility to control osbuild-composer
@@ -38,7 +38,6 @@ BuildRequires: git-core
 BuildRequires: make
 BuildRequires: gnupg2
 
-Patch0001: 0001-tests-Skip-checking-arch-when-testing-sent-body.patch
 
 %description
 Command line utility to control osbuild-composer
@@ -51,7 +50,6 @@ Command line utility to control osbuild-composer
 %forgeautosetup -p1
 %else
 %goprep
-%autopatch -p1
 %endif
 
 %build
@@ -132,93 +130,12 @@ composer-cli package.
 
 
 %changelog
-* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 36.0-3
-- rebuild
-
-* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 36.0-2
-- Rebuild for golang-1.25.0
-
-* Thu Aug 14 2025 Brian C. Lane <bcl@redhat.com> - 36.0-1
-- tests: Skip checking arch when testing sent body
-- New release: 36.0 (bcl)
-- golangci: Disable linting for a few things (bcl)
-- test: Remove unneeded fmt.Sprintf (bcl)
-- lint: Clean up lint errcheck errors (bcl)
-- workflows: Update to golangci-lint 2.3.0 (bcl)
-- workflows: Update to use go 1.23 and drop 1.21 and 1.22 (bcl)
-- GHA: enable the stale action to delete its saved state (thozza)
-- composer-cli: Add cloudapi support to delete command (bcl)
-- cloud: Add DeleteCompose function and tests (bcl)
-- cloud: Add DeleteRaw function and tests (bcl)
-- tests: Fix TestComposeInfoCloud (bcl)
-- cloud: Handle unexpected status codes (bcl)
-- composer-cli: Add cloudapi support to compose image command (bcl)
-- cloud: Add ComposeImagePath function (bcl)
-- cloud: Add GetFilePath function to download an image file (bcl)
-- common: Move part of GetFilePath into common.SaveResponseBodyToFile (bcl)
-- composer-cli: Add size to the compose status cloud command (bcl)
-- composer-cli: Add support for more cloudapi detail to compose list (bcl)
-- composer-cli: Add cloudapi support to the compose info command (bcl)
-- apischema: Add UploadTypes function to ComposeMetadataV1 (bcl)
-- cloud: Add GetComposeMetadata function (bcl)
-- common: Move blueprint struct to common (bcl)
-- cloud: Move status mapping into a function (bcl)
-- apischema: Move ComposeResponseV1 to apischema (bcl)
-- apischema: Move Status to apischema (bcl)
-- apischema: Move PackageDetails to apischema (bcl)
-- apischema: Move ComposeInfo to apischema (bcl)
-- apischema: Add a common location to define cloudapi structs (bcl)
-- build(deps): bump github.com/BurntSushi/toml from 1.4.0 to 1.5.0 (49699333+dependabot[bot])
-- compose: Add listing cloud composes to the status command (bcl)
-- compose: Add listing cloud composes to the list command (bcl)
-- cloud: Add test for ListComposes (bcl)
-- cloud: Implement ListComposes to return cloudapi compose info (bcl)
-- projects: Add cloudapi support to depsolve command (bcl)
-- blueprints: Add cloudapi support for depsolving local blueprint files (bcl)
-- cloud: Add DepsolveBlueprint function (bcl)
-- depsolve: Move parsing of weldr response into apischema (bcl)
-- depsolve: Use common.PackageNEVRA (bcl)
-- README.md: align with image-builder-cli (florian.schueller)
-- projects: Add cloudapi support to the list command (bcl)
-- projects: Add cloudapi support for project info command (bcl)
-- cloud: Add SearchPackages function (bcl)
-- composer-cli: Add a --weldr-only flag (bcl)
-- tests: OSTree does not support the qcow2 image type (bcl)
-- compose: Add cloudapi support to the compose types command (bcl)
-- cloud: Add ComposeTypes function to return image types (bcl)
-- common: Add SortedMapKeys helper (bcl)
-- distros: Add cloudapi support to the list command (bcl)
-- cloud: Add test for ListDistros (bcl)
-- cloud: Add ListDistros function to return distro names (bcl)
-- github/workflows/pr_best_practices: initial version (florian.schueller)
-- common: PackageNEVRA JSON epoch field can be string or int (bcl)
-- common: Move PackageNEVRA to common (bcl)
-- common: Move GetHostDistroName to common (bcl)
-- common: Refactor GetContentFilename (bcl)
-- common: Refactor cloud common to use internal common functions (bcl)
-- common: Create a common package to share functions (bcl)
-- weldr: Function to check APIResponse for an error ID (bcl)
-- build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (49699333+dependabot[bot])
-- cloud: Make the test bool private (bcl)
-- compose: Return an error when opening a file (bcl)
-- cloud: Add tests for ComposeWait function (bcl)
-- compose: Add cloud API --wait to start command (bcl)
-- compose: Add support for cloud API UUIDs to compose wait (bcl)
-- cloud: Add ComposeWait function (bcl)
-- cloud: Add test for ComposeInfo (bcl)
-- cloud: Add ComposeInfo function (bcl)
-- compose: Remove redundant 'Error' from error strings in start (bcl)
-- compose: Add upload handling for cloud (bcl)
-- cloud: Add support for passing upload options (bcl)
-- compose: Add ability to use a local blueprint to start a compose (bcl)
-- cloud: Add StartCompose function (bcl)
-- cloud: Add ServerStatus function (bcl)
-- status: Add cloudapi status to show command (bcl)
-- Makefile: Pass VERSION into build container (bcl)
-- cmd: Add cloudapi client (bcl)
-- cloud: Add basic Client functions for cloud api (bcl)
-- go.mod: Upgrade modules to current versions (bcl)
-- go.mod: Bump go version to 1.22.6 (bcl)
-- tools: Use go toolbox in prepare-source.sh (bcl)
-- Fix non-constant log strings (bcl)
-- Bump testify version to 1.10.0 (bcl)
+* Wed Oct 15 2025 Brian C. Lane <bcl@redhat.com> - 36.1-1
+- New release: 36.1 (bcl)
+- build(deps): bump actions/setup-go from 5 to 6 (49699333+dependabot[bot])
+- build(deps): bump github.com/spf13/cobra from 1.9.1 to 1.10.1 (49699333+dependabot[bot])
+- test: iot-qcow2-image does not support packages (bcl)
+- test: qcow2 renamed to server-qcow2 (bcl)
+- build(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (49699333+dependabot[bot])
+- build(deps): bump actions/checkout from 4 to 5 (49699333+dependabot[bot])
+- tests: Use current host arch in info and list tests (bcl)
\ No newline at end of file