From 6e9f88d6cf5c5702a9eb2f41e6b28f494efba018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 5 Apr 2016 14:55:08 -0400
Subject: [PATCH] Remove systemd-{udev,container} from @core

systemd-udev is now in @standard and @workstation-product.
systemd-container is now in @virtualization-headless.
---
 comps-f24.xml.in | 5 +++--
 comps-f25.xml.in | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 694038fe..f60cfbd3 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -680,8 +680,6 @@
       <packagereq type="mandatory">shadow-utils</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">systemd</packagereq>
-      <packagereq type="mandatory">systemd-udev</packagereq>
-      <packagereq type="optional">systemd-container</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="default">authconfig</packagereq>
@@ -5689,6 +5687,7 @@
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
       <packagereq>symlinks</packagereq>
+      <packagereq>systemd-udev</packagereq>
       <packagereq>tar</packagereq>
       <packagereq>tcpdump</packagereq>
       <packagereq>tcp_wrappers</packagereq>
@@ -6269,6 +6268,7 @@
       <packagereq type="mandatory">virt-install</packagereq>
       <packagereq type="default">libvirt-daemon-config-network</packagereq>
       <packagereq type="default">libvirt-daemon-kvm</packagereq>
+      <packagereq type="default">systemd-container</packagereq>
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="optional">guestfs-browser</packagereq>
       <packagereq type="optional">libguestfs-tools</packagereq>
@@ -6470,6 +6470,7 @@
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
       <packagereq>symlinks</packagereq>
+      <packagereq>systemd-udev</packagereq>
       <packagereq>tar</packagereq>
       <packagereq>tcpdump</packagereq>
       <packagereq>tcp_wrappers</packagereq>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index b16d4714..94915f6e 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -681,8 +681,6 @@
       <packagereq type="mandatory">shadow-utils</packagereq>
       <packagereq type="mandatory">sudo</packagereq>
       <packagereq type="mandatory">systemd</packagereq>
-      <packagereq type="mandatory">systemd-udev</packagereq>
-      <packagereq type="optional">systemd-container</packagereq>
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="default">authconfig</packagereq>
@@ -5690,6 +5688,7 @@
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
       <packagereq>symlinks</packagereq>
+      <packagereq>systemd-udev</packagereq>
       <packagereq>tar</packagereq>
       <packagereq>tcpdump</packagereq>
       <packagereq>tcp_wrappers</packagereq>
@@ -6270,6 +6269,7 @@
       <packagereq type="mandatory">virt-install</packagereq>
       <packagereq type="default">libvirt-daemon-config-network</packagereq>
       <packagereq type="default">libvirt-daemon-kvm</packagereq>
+      <packagereq type="default">systemd-container</packagereq>
       <packagereq type="default">qemu-kvm</packagereq>
       <packagereq type="optional">guestfs-browser</packagereq>
       <packagereq type="optional">libguestfs-tools</packagereq>
@@ -6464,6 +6464,7 @@
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
       <packagereq>symlinks</packagereq>
+      <packagereq>systemd-udev</packagereq>
       <packagereq>tar</packagereq>
       <packagereq>tcpdump</packagereq>
       <packagereq>tcp_wrappers</packagereq>