Update to F28, add a container.yaml

container.yaml now contains both the information that was previously in
flaptak.json and also information about the module to build the Flatpak
from that was previously passed on the command line.

container.yaml

@@ -0,0 +1,19 @@
+compose:
+    modules:
+        - eog:f28
+flatpak:
+    id: org.gnome.eog
+    runtime: org.fedoraproject.Platform
+    runtime-version: 28
+    command: eog
+    tags: ["Viewer"]
+    finish-args: >
+        --filesystem=host
+        --share=ipc
+        --socket=x11
+        --socket=wayland
+        --socket=session-bus
+        --filesystem=~/.config/dconf:ro
+        --filesystem=xdg-run/dconf
+        --talk-name=ca.desrt.dconf
+        --env=DCONF_USER_CONFIG_DIR=.config/dconf

eog.yaml

@@ -2,20 +2,17 @@ document: modulemd
 version: 1
 data:
     summary: Eye of GNOME Application Module
-    description:  The Eye of GNOME image viewer (eog) is the official image viewer for the
-       GNOME desktop. It can view single image files in a variety of formats, as
-       well as large image collections.
+    description:>
+        The Eye of GNOME image viewer (eog) is the official image viewer for the
+        GNOME desktop. It can view single image files in a variety of formats, as
+        well as large image collections.
     license:
         module: [ MIT ]
     dependencies:
         buildrequires:
-            flatpak-runtime: f26
-            base-runtime: f26
-            perl: f26
-            common-build-dependencies: f26
-            shared-userspace: f26
+            flatpak-runtime: f28
         requires:
-            flatpak-runtime: f26
+            flatpak-runtime: f28
     profiles:
         default:
             rpms:
@@ -24,25 +21,14 @@ data:
 #                - libpeas-loader-python3
     components:
         rpms:
+            bubblewrap:
+                rationale: Runtime dependency.
             eog:
-                rationale: Core application
-                ref: f26
-                buildorder: 3
-            exempi:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
-            libexif:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
-            glade:
-                # Could be conditionaled out in libpeas - this is just to find a location
-                # to install a glade catalog file.
-                rationale: Build dependency for libpeas
-                ref: f26
                 buildorder: 1
+                rationale: Runtime dependency.
+            exempi:
+                rationale: Runtime dependency.
+            gnome-desktop3:
+                rationale: Runtime dependency.
             libpeas:
-                rationale: Dependency
-                ref: f26
-                buildorder: 2
+                rationale: Runtime dependency.

flatpak.json

@@ -1,18 +0,0 @@
-{
-        "id": "org.gnome.eog",
-        "version": "3.20.0-2.fc26",
-        "runtime": "org.fedoraproject.Platform",
-        "runtime-version": "26",
-        "sdk": "org.fedoraproject.Sdk",
-        "command": "eog",
-        "tags": ["Viewer"],
-        "finish-args": ["--filesystem=host",
-                        "--share=ipc",
-                        "--socket=x11",
-                        "--socket=wayland",
-                        "--socket=session-bus",
-                        "--filesystem=~/.config/dconf:ro",
-                        "--filesystem=xdg-run/dconf",
-                        "--talk-name=ca.desrt.dconf",
-                        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"]
-}