From 8c8f6f2cd55077248bceefb7caf7b5a63778bde8 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Fri, 4 Mar 2022 14:03:48 +0100
Subject: [PATCH] spec: bump osbuild requirement to version 52

Needed due to the new `gpgkeys.fromtree` option in `org.osbuild.rpm`.
Pin osbuild version 52 in Schutzfile as well.
---
 Schutzfile            | 30 ++++++++++++++++++++++++++----
 osbuild-composer.spec |  8 ++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/Schutzfile b/Schutzfile
index f0b9eba0a..933adcfb5 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -1,26 +1,38 @@
 {
+  "fedora-34": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
+      }
+    }
+  },
   "fedora-35": {
     "dependencies": {
       "osbuild": {
-        "commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8"
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
       }
     }
   },
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
-        "commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8"
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
       }
     }
   },
   "rhel-8.5": {
     "dependencies": {
       "osbuild": {
-        "commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8"
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
       }
     }
   },
   "rhel-8.6": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
+      }
+    },
     "repos": {
       "file": "/etc/yum.repos.d/rhel8internal.repo",
       "x86_64": [
@@ -60,6 +72,11 @@
     }
   },
   "rhel-9.0": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
+      }
+    },
     "repos": {
       "file": "/etc/yum.repos.d/rhel9internal.repo",
       "x86_64": [
@@ -101,11 +118,16 @@
   "centos-8": {
     "dependencies": {
       "osbuild": {
-        "commit": "6300a80c8466fc7297253cba91bb99994fa4e5c8"
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
       }
     }
   },
   "centos-9": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "d8f36b55fa043002c6650a75fbeba5165cc0824b"
+      }
+    },
     "repos": {
       "file": "/etc/yum.repos.d/centos.repo",
       "x86_64": [
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index ce3dcb37f..7d5cd3e1a 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -324,10 +324,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 >= 49
-Requires:   osbuild-ostree >= 49
-Requires:   osbuild-lvm2 >= 49
-Requires:   osbuild-luks2 >= 49
+Requires:   osbuild >= 52
+Requires:   osbuild-ostree >= 52
+Requires:   osbuild-lvm2 >= 52
+Requires:   osbuild-luks2 >= 52
 Requires:   %{name}-dnf-json = %{version}-%{release}
 
 # remove in F34