Merge branch 'c9' into a9

.gitignore

@@ -1 +1 @@
-SOURCES/osbuild-composer-76.tar.gz
+SOURCES/osbuild-composer-88.1.tar.gz

.osbuild-composer.metadata

@@ -1 +1 @@
-f68a24e9d6a407708e33d72240b140e9c60378f1 SOURCES/osbuild-composer-76.tar.gz
+6f828e8be7795f958ba9a20642e68a0f7d2a5646 SOURCES/osbuild-composer-88.1.tar.gz

SOURCES/revert-Conditionally-skip-test-based-on-osbuild-compose.patch

@@ -0,0 +1,37 @@
+diff -aruN osbuild-composer-88.1/internal/client/blueprints_test.go osbuild-composer-88.1.alma/internal/client/blueprints_test.go
+--- osbuild-composer-88.1/internal/client/blueprints_test.go	2023-09-19 21:47:56
++++ osbuild-composer-88.1.alma/internal/client/blueprints_test.go	2023-11-07 17:26:20
+@@ -12,10 +12,7 @@
+ 
+ import (
+ 	"encoding/json"
+-	"fmt"
+-	"os/exec"
+ 	"sort"
+-	"strconv"
+ 	"strings"
+ 	"testing"
+ 
+@@ -1107,22 +1104,6 @@
+ func TestBlueprintFreezeGlobsV0(t *testing.T) {
+ 	// Test needs real packages, skip it for unit testing
+ 	if testState.unitTest {
+-		t.Skip()
+-	}
+-
+-	// works with osbuild-composer v83 and later
+-	rpm_q := exec.Command("rpm", "-q", "--qf", "%{version}", "osbuild-composer")
+-	out, err := rpm_q.CombinedOutput()
+-	if err != nil {
+-		assert.Fail(t, fmt.Sprintf("Error during rpm -q: %s", err))
+-	}
+-
+-	rpm_version, err := strconv.Atoi(string(out))
+-	if err != nil {
+-		assert.Fail(t, "Error during str-int conversion", err)
+-	}
+-
+-	if rpm_version < 83 {
+ 		t.Skip()
+ 	}
+ 

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        88
+Version:        88.1
 
 %gometa
 
@@ -22,7 +22,7 @@ It is compatible with composer-cli and cockpit-composer clients.
 }
 
 Name:           osbuild-composer
-Release:        1%{?dist}.alma
+Release:        1%{?dist}.alma.1
 Summary:        An image building service based on osbuild
 
 # osbuild-composer doesn't have support for building i686 and armv7hl images
@@ -33,6 +33,10 @@ License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
+# Patches were taken from:
+# and reverted from https://github.com/osbuild/osbuild-composer/commit/eb5dd8ae1b5fb9142ecd89e3d4202b4a3b661545
+Patch0:         revert-Conditionally-skip-test-based-on-osbuild-compose.patch
+
 Patch100:       almalinux_support.patch
 
 
@@ -401,12 +405,16 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
-* Thu Sep 21 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88-1.alma
+* Tue Nov 07 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.1-1.alma.1
 - Install AlmaLinux repositories
 - Add AlmaLinux support
 
+* Tue Nov 07 2023 Eduard Abdullin <eabdullin@almalinux.org> - 88.1-1
+- Update to 88.1
+
 * Thu Aug 24 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 88-1
 - New upstream release
+
 * Wed Aug 09 2023 imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> - 87-1
 - New upstream release