From 6e35a2ec89053311b90343b34c95a6386d6fbe46 Mon Sep 17 00:00:00 2001
From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Aug 31 2018 15:32:44 +0000
Subject: Regularize python-pip-wheel and python-setuptools-wheel changes


Propagate the changes to the SDK, remove packages that are no longer
needed with latest Python packages in f29, fix order.

---

diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index c6e719f..094db3f 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -360,12 +360,9 @@ data:
       - pulseaudio-libs
       - pulseaudio-libs-glib2
       - pulseaudio-utils
-      - python2-pip
-      - python3-pip
       - python-pip-wheel
-      - python2-setuptools
-      - python3-setuptools
       - python-setuptools-wheel
+      - python2-setuptools
       - python-unversioned-command
       - python2
       - python2-libs
@@ -754,10 +751,9 @@ data:
       - pulseaudio-libs
       - pulseaudio-libs-glib2
       - pulseaudio-utils
-      - python2-pip
-      - python3-pip
+      - python-pip-wheel
+      - python-setuptools-wheel
       - python2-setuptools
-      - python3-setuptools
       - python-unversioned-command
       - python2
       - python2-libs
@@ -1615,6 +1611,7 @@ data:
       - python3-mako
       - python2-markupsafe
       - python3-markupsafe
+      - python-pip-wheel
       - python2-pip
       - python3-pip
       - python3-rpm-generators
@@ -1622,6 +1619,7 @@ data:
       - python-srpm-macros
       - python2-rpm-macros
       - python3-rpm-macros
+      - python-setuptools-wheel
       - python2-setuptools
       - python3-setuptools
       - python3-six
@@ -2576,6 +2574,7 @@ data:
       - python3-mako
       - python2-markupsafe
       - python3-markupsafe
+      - python-pip-wheel
       - python2-pip
       - python3-pip
       - python3-rpm-generators
@@ -2583,6 +2582,7 @@ data:
       - python-srpm-macros
       - python2-rpm-macros
       - python3-rpm-macros
+      - python-setuptools-wheel
       - python2-setuptools
       - python3-setuptools
       - python3-six