From 65e03f04ab970a127734384582b1f95600cc04cb Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 4 Aug 2018 19:30:54 +0000
Subject: [PATCH] More comps fixups

Some stuff like `telnet` is in both `standard` and `gnome-desktop`.
We currently need to blacklist both.  I think we should massively
prune comps but...
---
 comps-sync-blacklist.yml       | 7 +++++++
 fedora-common-ostree-pkgs.json | 1 -
 fedora-common-ostree.json      | 1 +
 gnome-desktop-pkgs.json        | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 45634cb..aa812fc 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -79,6 +79,7 @@ blacklist:
     - net-tools
     - nmap-ncat
     # filesystem tools, again priv container
+    - symlinks
     - dosfstools
     - ntfs-3g
     # Misc
@@ -126,14 +127,20 @@ desktop_blacklist:
     - gnome-photos
     - gnome-screenshot
     - gnome-weather
+    - jwhois
     - nautilus
     - nautilus-sendto
     - orca
+    - rdist
     - sane-backends-drivers-scanners
+    - symlinks
     - simple-scan
     - sushi
+    - tcpdump
+    - telnet
     - totem
     - totem-nautilus
+    - traceroute
     - yelp
   kde-desktop:
     # Incompatible with ostree for various reasons
diff --git a/fedora-common-ostree-pkgs.json b/fedora-common-ostree-pkgs.json
index 26aece5..3a7eea0 100644
--- a/fedora-common-ostree-pkgs.json
+++ b/fedora-common-ostree-pkgs.json
@@ -195,7 +195,6 @@
         "spice-vdagent",
         "sssd",
         "sssd-common",
-        "sssd-kcm",
         "stix-fonts",
         "sudo",
         "system-config-printer-udev",
diff --git a/fedora-common-ostree.json b/fedora-common-ostree.json
index 9457a60..952635e 100644
--- a/fedora-common-ostree.json
+++ b/fedora-common-ostree.json
@@ -9,6 +9,7 @@
         "buildah",
         "docker",
         "flatpak",
+        "flatpak-builder",
         "git-core",
         "podman",
         "rpm-ostree",
diff --git a/gnome-desktop-pkgs.json b/gnome-desktop-pkgs.json
index f5b0db4..8e555ff 100644
--- a/gnome-desktop-pkgs.json
+++ b/gnome-desktop-pkgs.json
@@ -15,7 +15,6 @@
         "at-spi2-core",
         "avahi",
         "dconf",
-        "fprintd-pam",
         "gdm",
         "glib-networking",
         "gnome-backgrounds",