From 43a82b52d7e620dc8349b3418e0482e78d5fa659 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 17 2017 21:12:24 +0000
Subject: [PATCH 1/5] Do some cleanup of packages


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index e57d107..7d19779 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -47,12 +47,6 @@
 		"adwaita-qt5",
 		"alsa-plugins-pulseaudio",
 		"alsa-utils",
-		"anaconda",
-		"anaconda-core",
-		"anaconda-gui",
-		"anaconda-tui",
-		"anaconda-user-help",
-		"anaconda-widgets",
 		"at",
 		"atmel-firmware",
 		"at-spi2-atk",
@@ -90,7 +84,6 @@
 		"cheese",
 		"chrony",
 		"cifs-utils",
-		"clucene09-core",
 		"clutter-gst2",
 		"control-center",
 		"coreutils",
@@ -111,20 +104,14 @@
 		"cyrus-sasl-md5",
 		"cyrus-sasl-plain",
 		"dconf",
-		"deltarpm",
 		"device-mapper-multipath",
 		"device-mapper-multipath-libs",
 		"dmidecode",
 		"dmraid",
 		"dmraid-events",
-		"dnf",
-		"dnf-conf",
-		"dnf-plugins-core",
-		"dnf-yum",
 		"dos2unix",
 		"dracut-config-generic",
 		"dracut-network",
-		"drpm",
 		"e2fsprogs",
 		"ebtables",
 		"efibootmgr",
@@ -132,12 +119,6 @@
 		"environment-modules",
 		"eog",
 		"ethtool",
-		"evince",
-		"evince-djvu",
-		"evince-nautilus",
-		"evolution",
-		"evolution-ews",
-		"evolution-help",
 		"fcoe-utils",
 		"fedora-bookmarks",
 		"fedora-productimg-workstation",
@@ -356,17 +337,6 @@
 		"LibRaw",
 		"librbd1",
 		"librdmacm",
-		"libreoffice-calc",
-		"libreoffice-draw",
-		"libreoffice-emailmerge",
-		"libreoffice-filters",
-		"libreoffice-graphicfilter",
-		"libreoffice-impress",
-		"libreoffice-math",
-		"libreoffice-pdfimport",
-		"libreoffice-pyuno",
-		"libreoffice-writer",
-		"libreoffice-xsltfilter",
 		"libreport",
 		"libreport-anaconda",
 		"libreport-cli",
@@ -482,39 +452,6 @@
 		"passwdqc-lib",
 		"pciutils",
 		"pciutils-libs",
-		"pcre2",
-		"perl",
-		"perl-Carp",
-		"perl-constant",
-		"perl-Data-Dumper",
-		"perl-Encode",
-		"perl-Errno",
-		"perl-Exporter",
-		"perl-File-Path",
-		"perl-File-Temp",
-		"perl-Getopt-Long",
-		"perl-HTTP-Tiny",
-		"perl-IO",
-		"perl-libs",
-		"perl-macros",
-		"perl-MIME-Base64",
-		"perl-parent",
-		"perl-PathTools",
-		"perl-Pod-Escapes",
-		"perl-podlators",
-		"perl-Pod-Perldoc",
-		"perl-Pod-Simple",
-		"perl-Pod-Usage",
-		"perl-Scalar-List-Utils",
-		"perl-Socket",
-		"perl-Term-ANSIColor",
-		"perl-Term-Cap",
-		"perl-Text-ParseWords",
-		"perl-Text-Tabs+Wrap",
-		"perl-threads",
-		"perl-threads-shared",
-		"perl-Time-Local",
-		"perl-Unicode-Normalize",
 		"pinfo",
 		"plymouth",
 		"plymouth-graphics-libs",
@@ -527,7 +464,6 @@
 		"poppler-utils",
 		"procps-ng",
 		"psacct",
-		"python",
 		"python3-augeas",
 		"python3-beaker",
 		"python3-blivet",
@@ -536,8 +472,6 @@
 		"python3-cups",
 		"python3-decorator",
 		"python3-dmidecode",
-		"python3-dnf",
-		"python3-dnf-plugins-core",
 		"python3-enchant",
 		"python3-firewall",
 		"python3-hawkey",
@@ -573,18 +507,8 @@
 		"qemu-system-x86",
 		"qgnomeplatform",
 		"qpdf-libs",
-		"qt",
-		"qt5-qtbase",
-		"qt5-qtbase-common",
-		"qt5-qtbase-gui",
-		"qt5-qtdeclarative",
-		"qt5-qtxmlpatterns",
-		"qt-common",
-		"qt-settings",
-		"qt-x11",
 		"radvd",
 		"rdist",
-		"rhythmbox",
 		"rng-tools",
 		"rootfiles",
 		"rpm",
@@ -614,7 +538,6 @@
 		"shadow-utils",
 		"sheepdog",
 		"shim",
-		"shotwell",
 		"sil-abyssinica-fonts",
 		"sil-mingzat-fonts",
 		"sil-nuosu-fonts",
@@ -661,7 +584,6 @@
 		"totem-nautilus",
 		"traceroute",
 		"tree",
-		"unoconv",
 		"usb_modeswitch",
 		"usb_modeswitch-data",
 		"usbutils",

From fec3edff2fd120d9c8bcfb556465a7300bb33e98 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 17 2017 21:12:48 +0000
Subject: [PATCH 2/5] Remove broken cyrus subpackages


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index 7d19779..2df8d0b 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -101,8 +101,6 @@
 		"curl",
 		"cyrus-sasl",
 		"cyrus-sasl-gssapi",
-		"cyrus-sasl-md5",
-		"cyrus-sasl-plain",
 		"dconf",
 		"device-mapper-multipath",
 		"device-mapper-multipath-libs",

From 52a5e65482b7f3a31d95eb27f0e5b0c60f714899 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 17 2017 21:12:53 +0000
Subject: [PATCH 3/5] Remove the packages not in the Workstation repo


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index 2df8d0b..c7d621c 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -309,8 +309,6 @@
 		"libgovirt",
 		"libgpod",
 		"libhangul",
-		"libhbaapi",
-		"libhbalinux",
 		"libibverbs",
 		"libidn2",
 		"libipa_hbac",
@@ -489,7 +487,6 @@
 		"python3-pillow",
 		"python3-pwquality",
 		"python3-pycurl",
-		"python3-pygpgme",
 		"python3-pyparted",
 		"python3-pytz",
 		"python3-pyudev",
@@ -522,7 +519,6 @@
 		"scl-utils",
 		"SDL2",
 		"seabios-bin",
-		"seahorse",
 		"seavgabios-bin",
 		"selinux-policy-targeted",
 		"setroubleshoot",
@@ -599,7 +595,6 @@
 		"words",
 		"wpa_supplicant",
 		"wvdial",
-		"xalan-c",
 		"xcb-util-image",
 		"xcb-util-keysyms",
 		"xcb-util-renderutil",
@@ -608,11 +603,9 @@
 		"xdg-utils",
 		"xen-libs",
 		"xen-licenses",
-		"xerces-c",
 		"xfsprogs",
 		"xmlrpc-c",
 		"xmlrpc-c-client",
-		"xml-security-c",
 		"xorg-x11-drv-ati",
 		"xorg-x11-drv-evdev",
 		"xorg-x11-drv-fbdev",

From 3e93c27d8f950e39414a39641f0dfd9834c08382 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 17 2017 21:12:58 +0000
Subject: [PATCH 4/5] Add docker and atomic


Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index c7d621c..a98634e 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -51,6 +51,7 @@
 		"atmel-firmware",
 		"at-spi2-atk",
 		"at-spi2-core",
+		"atomic",
 		"attr",
 		"audit",
 		"augeas-libs",
@@ -107,6 +108,7 @@
 		"dmidecode",
 		"dmraid",
 		"dmraid-events",
+		"docker",
 		"dos2unix",
 		"dracut-config-generic",
 		"dracut-network",

From c246dbdb339c5e4a8d1f7c8818be0bbd635a34f7 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: May 17 2017 21:13:10 +0000
Subject: [PATCH 5/5] Clean up a bunch of packages


Some of these we probably don't want on a workstation, and some
will be dragged in via dependencies.
Dragging in via dependencies means that if an application changes
its implementation and then uses a different dependency, we don't
end up with various now-deprecated packages.

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedora-ostree-workstation.json b/fedora-ostree-workstation.json
index a98634e..9406b2c 100644
--- a/fedora-ostree-workstation.json
+++ b/fedora-ostree-workstation.json
@@ -70,15 +70,8 @@
 		"bind-license",
 		"bind-utils",
 		"bluez-cups",
-		"boost-iostreams",
-		"boost-random",
-		"boost-system",
-		"boost-thread",
-		"brasero-libs",
 		"bridge-utils",
-		"btrfs-progs",
 		"bzip2",
-		"c-ares",
 		"caribou",
 		"caribou-gtk2-module",
 		"caribou-gtk3-module",
@@ -88,11 +81,7 @@
 		"clutter-gst2",
 		"control-center",
 		"coreutils",
-		"corosync",
-		"corosynclib",
 		"crda",
-		"createrepo_c",
-		"createrepo_c-libs",
 		"cryptsetup",
 		"cups",
 		"cups-client",
@@ -100,9 +89,6 @@
 		"cups-filters",
 		"cups-filters-libs",
 		"curl",
-		"cyrus-sasl",
-		"cyrus-sasl-gssapi",
-		"dconf",
 		"device-mapper-multipath",
 		"device-mapper-multipath-libs",
 		"dmidecode",
@@ -112,10 +98,8 @@
 		"dos2unix",
 		"dracut-config-generic",
 		"dracut-network",
-		"e2fsprogs",
 		"ebtables",
 		"efibootmgr",
-		"elfutils",
 		"environment-modules",
 		"eog",
 		"ethtool",
@@ -137,13 +121,10 @@
 		"fprintd-pam",
 		"fros",
 		"fros-gnome",
-		"gdb",
 		"gdm",
 		"gedit",
-		"genisoimage",
 		"ghostscript",
 		"ghostscript-x11",
-		"glade-libs",
 		"glibc",
 		"glibc-langpack-en",
 		"glib-networking",
@@ -163,7 +144,6 @@
 		"gnome-color-manager",
 		"gnome-contacts",
 		"gnome-disk-utility",
-		"gnome-documents",
 		"gnome-font-viewer",
 		"gnome-getting-started-docs",
 		"gnome-initial-setup",
@@ -199,7 +179,6 @@
 		"gperftools-libs",
 		"grub2",
 		"grub2-efi",
-		"gtkmm24",
 		"gutenprint",
 		"gutenprint-cups",
 		"gutenprint-libs",
@@ -262,7 +241,6 @@
 		"iwl6050-firmware",
 		"iwl7260-firmware",
 		"jansson",
-		"jimtcl",
 		"jomolhari-fonts",
 		"jwhois",
 		"kbd",
@@ -399,7 +377,6 @@
 		"m17n-lib",
 		"mactel-boot",
 		"man-pages",
-		"marisa",
 		"mcelog",
 		"media-player-info",
 		"mesa-dri-drivers",
@@ -573,8 +550,6 @@
 		"telnet",
 		"thai-scalable-fonts-common",
 		"thai-scalable-waree-fonts",
-		"tigervnc-license",
-		"tigervnc-server-minimal",
 		"time",
 		"totem",
 		"totem-nautilus",
@@ -606,8 +581,6 @@
 		"xen-libs",
 		"xen-licenses",
 		"xfsprogs",
-		"xmlrpc-c",
-		"xmlrpc-c-client",
 		"xorg-x11-drv-ati",
 		"xorg-x11-drv-evdev",
 		"xorg-x11-drv-fbdev",

