diff --git a/.gitignore b/.gitignore index 4505ade..b749faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/osbuild-composer-88.1.tar.gz +SOURCES/osbuild-composer-88.2.tar.gz diff --git a/.osbuild-composer.metadata b/.osbuild-composer.metadata index 6b5d7a8..74651ff 100644 --- a/.osbuild-composer.metadata +++ b/.osbuild-composer.metadata @@ -1 +1 @@ -6f828e8be7795f958ba9a20642e68a0f7d2a5646 SOURCES/osbuild-composer-88.1.tar.gz +a8cadabdb422de148aa9a375631e1ef32b52afaa SOURCES/osbuild-composer-88.2.tar.gz diff --git a/SOURCES/revert-Conditionally-skip-test-based-on-osbuild-compose.patch b/SOURCES/revert-Conditionally-skip-test-based-on-osbuild-compose.patch deleted file mode 100644 index b596a78..0000000 --- a/SOURCES/revert-Conditionally-skip-test-based-on-osbuild-compose.patch +++ /dev/null @@ -1,37 +0,0 @@ -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() - } - diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index ee13776..0dd0870 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -9,7 +9,7 @@ %global goipath github.com/osbuild/osbuild-composer -Version: 88.1 +Version: 88.2 %gometa @@ -33,10 +33,6 @@ 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 @@ -405,12 +401,12 @@ Integration tests to be run on a pristine-dedicated system to test the osbuild-c %endif %changelog -* Tue Nov 07 2023 Eduard Abdullin - 88.1-1.alma.1 +* Wed Dec 13 2023 Eduard Abdullin - 88.2-1.alma.1 - Install AlmaLinux repositories - Add AlmaLinux support -* Tue Nov 07 2023 Eduard Abdullin - 88.1-1 -- Update to 88.1 +* Wed Dec 13 2023 Eduard Abdullin - 88.2-1 +- New upstream release * Thu Aug 24 2023 imagebuilder-bot - 88-1 - New upstream release