From 51141adda93d0851426aa0ca29e8e7146ad02de8 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Tue, 21 Nov 2023 12:16:13 -0500
Subject: [PATCH] Update for F39 Flatpaks without modules

---
 container.yaml | 10 +++++---
 evolution.yaml | 68 --------------------------------------------------
 2 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 evolution.yaml

diff --git a/container.yaml b/container.yaml
index 717a77e..dcb9f50 100644
--- a/container.yaml
+++ b/container.yaml
@@ -1,9 +1,11 @@
-compose:
-    modules:
-    - evolution:stable
 flatpak:
     id: org.gnome.Evolution
     branch: stable
+    runtime-name: flatpak-runtime
+    runtime-version: f39
+    packages:
+    - evolution
+    - evolution-ews
     command: evolution
     rename-icon: evolution
     copy-icon: true
@@ -26,3 +28,5 @@ flatpak:
         --filesystem=~/.pki:rw
         --filesystem=xdg-config/pki:rw
         --filesystem=xdg-run/gvfsd:rw
+    cleanup-commands: |
+        /app/libexec/evolution-data-server/set-dbus-prefix org.gnome.Evolution
diff --git a/evolution.yaml b/evolution.yaml
deleted file mode 100644
index e116ab7..0000000
--- a/evolution.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
----
-document: modulemd
-version: 2
-data:
-  summary: Mail and calendar client for GNOME
-  description: >-
-    Evolution is the GNOME mailer, calendar, contact manager and communications tool. 
-    The components which make up Evolution are tightly integrated with one another
-    and act as a seamless personal information-management tool.
-  license:
-    module:
-    - MIT
-  dependencies:
-  - buildrequires:
-      flatpak-common: [f38]
-      flatpak-runtime: [f38]
-      platform: [f38]
-    requires:
-      flatpak-common: [f38]
-      flatpak-runtime: [f38]
-      platform: [f38]
-  profiles:
-    default:
-      rpms:
-      - evolution
-      - evolution-ews
-  buildopts:
-    rpms:
-      macros: |
-        %_eds_dbus_services_prefix org.gnome.Evolution
-    arches: [aarch64, x86_64]
-  components:
-    rpms:
-      cmark:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-      gnome-autoar:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 1
-      highlight:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 1
-      ytnef:
-        rationale: Runtime dependency
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 1
-      evolution-data-server:
-        rationale: Runtime dependency, requires _eds_dbus_services_prefix from above
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 1
-      evolution:
-        rationale: Application package
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 2
-      evolution-ews:
-        rationale: Application plugin package
-        ref: f38
-        arches: [aarch64, x86_64]
-        buildorder: 3
-...