From 603ebb68e1e4807036c1eba6db2e2a2d3b3ee67e Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Fri, 30 Sep 2022 12:36:57 +0200
Subject: [PATCH] spec: bump osbuild dep to >= 69

osbuild 69 fixed a bug in the ostree.config stage that we now require
for setting the ior-raw-image [1].

The version hasn't been released yet, so pin osbuild version that
provides the fix for all distros.

[1] https://github.com/osbuild/osbuild/commit/8a7b6d382de16b7be30c4d37e10f24c416a294f8
---
 Schutzfile            | 20 ++++++++++----------
 osbuild-composer.spec |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Schutzfile b/Schutzfile
index f94c4ea0fd..4c7c38682e 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -2,7 +2,7 @@
   "fedora-35": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     },
     "repos": [
@@ -233,21 +233,21 @@
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     }
   },
   "rhel-8.6": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     }
   },
   "rhel-8.7": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     },
     "repos": [
@@ -293,14 +293,14 @@
   "rhel-9.0": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     }
   },
   "rhel-9.1": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     },
     "repos": [
@@ -346,21 +346,21 @@
   "centos-8": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     }
   },
   "centos-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     }
   },
   "centos-stream-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     },
     "repos": [
@@ -406,7 +406,7 @@
   "centos-stream-8": {
     "dependencies": {
       "osbuild": {
-        "commit": "c824e18b458823eb7dd8ca582b0a990bfdc7f257"
+        "commit": "8a7b6d382de16b7be30c4d37e10f24c416a294f8"
       }
     },
     "repos": [
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index 5d2d22fcb3..e3e6cc510b 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -306,10 +306,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 >= 65
-Requires:   osbuild-ostree >= 65
-Requires:   osbuild-lvm2 >= 65
-Requires:   osbuild-luks2 >= 65
+Requires:   osbuild >= 69
+Requires:   osbuild-ostree >= 69
+Requires:   osbuild-lvm2 >= 69
+Requires:   osbuild-luks2 >= 69
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 %description worker