import osbuild-composer-88.2-1.el9_3

.gitignore

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

.osbuild-composer.metadata

@@ -1 +1 @@
-6f828e8be7795f958ba9a20642e68a0f7d2a5646 SOURCES/osbuild-composer-88.1.tar.gz
+a8cadabdb422de148aa9a375631e1ef32b52afaa SOURCES/osbuild-composer-88.2.tar.gz

SOURCES/0001-test-remove-package-version-check.patch

@@ -1,51 +0,0 @@
-From 21f96abd61be2d10ea9543d137eb51f7ae6c769f Mon Sep 17 00:00:00 2001
-From: Achilleas Koutsou <achilleas@koutsou.net>
-Date: Wed, 20 Sep 2023 14:30:36 +0200
-Subject: [PATCH] test: remove package version check
-
-Package version parsing fails on minor releases (88.1).
----
- internal/client/blueprints_test.go | 19 -------------------
- 1 file changed, 19 deletions(-)
-
-diff --git a/internal/client/blueprints_test.go b/internal/client/blueprints_test.go
-index 8cfa9a7be..c1c89d36e 100644
---- a/internal/client/blueprints_test.go
-+++ b/internal/client/blueprints_test.go
-@@ -12,10 +12,7 @@ package client
- 
- import (
- 	"encoding/json"
--	"fmt"
--	"os/exec"
- 	"sort"
--	"strconv"
- 	"strings"
- 	"testing"
- 
-@@ -1110,22 +1107,6 @@ func TestBlueprintFreezeGlobsV0(t *testing.T) {
- 		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()
--	}
--
- 	bp := `{
- 		"name": "test-freeze-blueprint-glob-v0",
- 		"description": "TestBlueprintFreezeGlobsV0",
--- 
-2.42.0
-

SPECS/osbuild-composer.spec

@@ -9,7 +9,7 @@
 
 %global goipath         github.com/osbuild/osbuild-composer
 
-Version:        88.1
+Version:        88.2
 
 %gometa
 
@@ -33,11 +33,6 @@ License:        Apache-2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
-# Patch generated from the upstream rhel-9.3.0 branch:
-# git clone https://github.com/osbuild/osbuild-composer.git --branch rhel-9.3.0
-# git format-patch v88.1..
-Patch1: 0001-test-remove-package-version-check.patch
-
 BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
 BuildRequires:  systemd
 BuildRequires:  krb5-devel
@@ -420,6 +415,9 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c
 %endif
 
 %changelog
+* Tue Oct 24 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.2-1
+- New upstream release
+
 * Wed Sep 20 2023 Achilleas Koutsou <achilleas@redhat.com> - 88.1-1
 - New upstream release
 - test: remove package version check