[flatpaks/flatpak-runtime] f45: Install flatpak-xdg-email and flatpak-xdg-open as xdg-email and xdg-open

[flatpaks/flatpak-runtime] f45: Install flatpak-xdg-email and flatpak-xdg-open as xdg-email and xdg-open

[Kalev Lember]

            A new commit has been pushed.

            Repo   : flatpaks/flatpak-runtime
            Branch : f45
            Commit : db7ccaa0b60a8e65cec331987472f397d54d7443
            Author : Kalev Lember <klember@redhat.com>
            Date   : 2021-02-05T18:08:08+01:00
            Stats  : +10/-0 in 3 file(s)
            URL    : https://src.fedoraproject.org/flatpaks/flatpak-runtime/c/db7ccaa0b60a8e65cec331987472f397d54d7443?branch=f45

            Log:
            Install flatpak-xdg-email and flatpak-xdg-open as xdg-email and xdg-open

This matches with the flatpak-xdg-utils change that added flatpak
prefix to flatpak-xdg-utils versions of xdg-email and xdg-open.

With this change, we now include _both_ xdg-utils and flatpak-xdg-utils
in the module build, and overwrite the xdg-utils versions of xdg-email
and xdg-open with the flatpak-xdg-utils versions when building the
container.

---
diff --git a/container.yaml b/container.yaml
index 8d3775f..cb2a949 100644
--- a/container.yaml
+++ b/container.yaml
@@ -22,6 +22,9 @@ flatpak:
             --origin=flatpak          \
             org.fedoraproject.Platform 1>&2
 
+        mv -f /usr/bin/flatpak-xdg-email /usr/bin/xdg-email
+        mv -f /usr/bin/flatpak-xdg-open /usr/bin/xdg-open
+
         rm -rf /etc/flatpak-builder/
 
         touch -d @0 /usr/share/fonts /usr/share/fonts/*

diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index ed9d3e5..e0bd6db 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -552,6 +552,7 @@ data:
       - xcb-util-wm
       - xdg-dbus-proxy
       - xdg-user-dirs
+      - xdg-utils
       - xkeyboard-config
       - xorg-x11-server-utils
       - xorg-x11-xauth
@@ -622,6 +623,7 @@ data:
       - dejavu-sans-fonts
       - dejavu-sans-mono-fonts
       - dejavu-serif-fonts
+      - desktop-file-utils
       - diffutils
       - e2fsprogs-libs
       - libcom_err
@@ -629,6 +631,7 @@ data:
       - elfutils-default-yama-scope
       - elfutils-libelf
       - elfutils-libs
+      - emacs-filesystem
       - eosrei-emojione-fonts
       - expat
       - fdk-aac-free
@@ -1072,6 +1075,7 @@ data:
       - xcb-util-renderutil
       - xcb-util-wm
       - xdg-user-dirs
+      - xdg-utils
       - xkeyboard-config
       - xorg-x11-server-utils
       - xorg-x11-xauth
@@ -2329,6 +2333,7 @@ data:
       - xcb-util-wm-devel
       - xdg-dbus-proxy
       - xdg-user-dirs
+      - xdg-utils
       - xkeyboard-config
       - xkeyboard-config-devel
       - xorg-x11-font-utils
@@ -3546,6 +3551,7 @@ data:
       - xcb-util-wm
       - xcb-util-wm-devel
       - xdg-user-dirs
+      - xdg-utils
       - xkeyboard-config
       - xkeyboard-config-devel
       - xorg-x11-font-utils

diff --git a/package-notes.txt b/package-notes.txt
index fdcb9d8..a42b187 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -35,6 +35,7 @@ fedora-gpg-keys
 fedora-release
 fedora-repos
 filesystem: W: data files
+flatpak-xdg-utils: EB: flatpak versions of xdg-email and xdg-open
 fonts-filesystem: W: data files
 gc: FD: make
 gdk-pixbuf2-modules: W: no bins/libs