From 7898676476d8a755d0aa72ccaa74a737f348dcba Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Fri, 6 Oct 2023 14:08:49 -0400
Subject: [PATCH] F39

---
 container.yaml |  7 ++++---
 kdiff3.yaml    | 34 ----------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 kdiff3.yaml

diff --git a/container.yaml b/container.yaml
index 660b00d..84f70ff 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,6 +1,3 @@
-compose:
-    modules:
-    - kdiff3:stable
 flatpak:
     id: org.kde.kdiff3
     branch: stable
@@ -12,3 +9,7 @@ flatpak:
         --share=ipc
         --socket=fallback-x11
         --socket=wayland
+    runtime-name: flatpak-kde5-runtime
+    runtime-version: f39
+    packages:
+        - kdiff3
diff --git a/kdiff3.yaml b/kdiff3.yaml
deleted file mode 100644
index ba9f3a0..0000000
--- a/kdiff3.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  summary: Compare + merge 2 or 3 files or directories
-  description: >-
-    KDiff3 is a program that - compares and merges two or three input files or directories,
-    - shows the differences line by line and character by character (!), - provides
-    an automatic merge-facility and - an integrated editor for comfortable solving
-    of merge-conflicts - has support for KDE-KIO (ftp, sftp, http, fish, smb) - and
-    has an intuitive graphical user interface.
-  license:
-    module:
-    - MIT
-  buildopts:
-    arches: [aarch64, x86_64]
-  dependencies:
-  - buildrequires:
-      flatpak-kde5-runtime: [f38]
-      platform: [f38]
-    requires:
-      flatpak-kde5-runtime: [f38]
-      platform: [f38]
-  profiles:
-    default:
-      rpms:
-      - kdiff3
-  components:
-    rpms:
-      kdiff3:
-        rationale: Application package
-        ref: f38
-        arches: [aarch64, x86_64]
-...