From 89274e538da4755c113e9e66d777c1dfad1f0be1 Mon Sep 17 00:00:00 2001 From: Simon de Vlieger Date: Tue, 27 Jun 2023 15:29:37 +0200 Subject: [PATCH] spec: require osbuild >= 89 The recently merged `live-installer` image type depends on osbuild >= 89, see the following commit in osbuild: https://github.com/osbuild/osbuild/commit/c90b587dccf5f82e5732b7a264866c3535c066c2 --- Schutzfile | 32 ++++++++++++++++---------------- osbuild-composer.spec | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Schutzfile b/Schutzfile index 9713c6988..fb9116d0b 100644 --- a/Schutzfile +++ b/Schutzfile @@ -2,7 +2,7 @@ "fedora-37": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -79,7 +79,7 @@ "fedora-38": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -156,28 +156,28 @@ "rhel-8.4": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "rhel-8.6": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "rhel-8.7": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "rhel-8.8": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -223,7 +223,7 @@ "rhel-8.9": { "dependencies": { "osbuild": { - "commit": "8669d0ad4ca2941da21191cacec738b5b5ec734d" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -269,21 +269,21 @@ "rhel-9.0": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "rhel-9.1": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "rhel-9.2": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -329,7 +329,7 @@ "rhel-9.3": { "dependencies": { "osbuild": { - "commit": "8669d0ad4ca2941da21191cacec738b5b5ec734d" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -375,21 +375,21 @@ "centos-8": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "centos-9": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } } }, "centos-stream-9": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -435,7 +435,7 @@ "centos-stream-8": { "dependencies": { "osbuild": { - "commit": "1fbd9d975f15b845b9a9519097cd307253a64f1e" + "commit": "c90b587dccf5f82e5732b7a264866c3535c066c2" } }, "repos": [ @@ -492,4 +492,4 @@ } ] } -} \ No newline at end of file +} diff --git a/osbuild-composer.spec b/osbuild-composer.spec index c1428df70..b8d141773 100644 --- a/osbuild-composer.spec +++ b/osbuild-composer.spec @@ -294,10 +294,10 @@ The core osbuild-composer binary. This is suitable both for spawning in containe Summary: The worker for osbuild-composer Requires: systemd Requires: qemu-img -Requires: osbuild >= 85 -Requires: osbuild-ostree >= 85 -Requires: osbuild-lvm2 >= 85 -Requires: osbuild-luks2 >= 85 +Requires: osbuild >= 89 +Requires: osbuild-ostree >= 89 +Requires: osbuild-lvm2 >= 89 +Requires: osbuild-luks2 >= 89 Requires: %{name}-dnf-json = %{version}-%{release} %description worker