From 00f9b66b610886c2f774039383e6d29a9b646560 Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: Oct 16 2016 13:06:27 +0000
Subject: Adding merged upstream comps for 7.4 (1708 release)


---

diff --git a/c7-x86_64-comps.xml b/c7-x86_64-comps.xml
index 390b625..6b9ec24 100644
--- a/c7-x86_64-comps.xml
+++ b/c7-x86_64-comps.xml
@@ -108,7 +108,6 @@
       <packagereq type="mandatory">libgnome-keyring-devel</packagereq>
       <packagereq type="mandatory">libgudev1-devel</packagereq>
       <packagereq type="mandatory">libhugetlbfs-devel</packagereq>
-      <packagereq type="mandatory">libibverbs-devel</packagereq>
       <packagereq type="mandatory">libitm-devel</packagereq>
       <packagereq type="mandatory">libnl-devel</packagereq>
       <packagereq type="mandatory">libnotify-devel</packagereq>
@@ -154,6 +153,7 @@
       <packagereq type="mandatory">qt3-MySQL</packagereq>
       <packagereq type="mandatory">qt3-ODBC</packagereq>
       <packagereq type="mandatory">qt3-PostgreSQL</packagereq>
+      <packagereq type="mandatory">rdma-core-devel</packagereq>
       <packagereq type="mandatory">readline-devel</packagereq>
       <packagereq type="mandatory">sane-backends-devel</packagereq>
       <packagereq type="mandatory">SDL-devel</packagereq>
@@ -168,6 +168,8 @@
       <packagereq type="mandatory">unixODBC-devel</packagereq>
       <packagereq type="mandatory">xorg-x11-proto-devel</packagereq>
       <packagereq type="mandatory">xz-devel</packagereq>
+      <packagereq type="optional">flatpak</packagereq>
+      <packagereq type="optional">subversion-gnome</packagereq>
     </packagelist>
   </group>
   <group>
@@ -215,17 +217,25 @@
       <packagereq type="mandatory">fcoe-utils</packagereq>
       <packagereq type="mandatory">firewalld</packagereq>
       <packagereq type="mandatory">gfs2-utils</packagereq>
-      <packagereq type="mandatory">grub2</packagereq>
-      <packagereq type="mandatory">grub2-efi</packagereq>
       <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
       <packagereq type="mandatory">lvm2</packagereq>
       <packagereq type="mandatory">mdadm</packagereq>
-      <packagereq type="mandatory">shim</packagereq>
       <packagereq type="mandatory">system-config-firewall-base</packagereq>
       <packagereq type="mandatory">tboot</packagereq>
       <packagereq type="mandatory">tmux</packagereq>
       <packagereq type="mandatory">xfsprogs</packagereq>
+      <packagereq type="default">grub2</packagereq>
+      <packagereq type="default">shim-x64</packagereq>
+      <packagereq type="optional">dbxtool</packagereq>
+      <packagereq type="optional">grub2-efi-ia32</packagereq>
+      <packagereq type="optional">grub2-efi-ia32-modules</packagereq>
+      <packagereq type="optional">grub2-efi-x64</packagereq>
+      <packagereq type="optional">grub2-efi-x64-modules</packagereq>
+      <packagereq type="optional">grub2-pc</packagereq>
       <packagereq type="optional">oscap-anaconda-addon</packagereq>
+      <packagereq type="optional">shim-ia32</packagereq>
+      <packagereq type="optional">shim-unsigned-ia32</packagereq>
+      <packagereq type="optional">shim-unsigned-x64</packagereq>
     </packagelist>
   </group>
   <group>
@@ -564,6 +574,8 @@
       <packagereq type="optional">device-mapper-persistent-data</packagereq>
       <packagereq type="optional">dos2unix</packagereq>
       <packagereq type="optional">dumpet</packagereq>
+      <packagereq type="optional">fwupd</packagereq>
+      <packagereq type="optional">fwupdate</packagereq>
       <packagereq type="optional">genisoimage</packagereq>
       <packagereq type="optional">gpm</packagereq>
       <packagereq type="optional">i2c-tools</packagereq>
@@ -583,6 +595,7 @@
       <packagereq type="optional">mtools</packagereq>
       <packagereq type="optional">ncurses-term</packagereq>
       <packagereq type="optional">ntp</packagereq>
+      <packagereq type="optional">nvmetcli</packagereq>
       <packagereq type="optional">oddjob</packagereq>
       <packagereq type="optional">pax</packagereq>
       <packagereq type="optional">prelink</packagereq>
@@ -600,6 +613,7 @@
       <packagereq type="optional">star</packagereq>
       <packagereq type="optional">tmpwatch</packagereq>
       <packagereq type="optional">udftools</packagereq>
+      <packagereq type="optional">usbguard</packagereq>
       <packagereq type="optional">uuidd</packagereq>
       <packagereq type="optional">volume_key</packagereq>
       <packagereq type="optional">wodim</packagereq>
@@ -1097,7 +1111,6 @@
       <packagereq type="mandatory">audit</packagereq>
       <packagereq type="mandatory">basesystem</packagereq>
       <packagereq type="mandatory">bash</packagereq>
-      <packagereq type="mandatory">biosdevname</packagereq>
       <packagereq type="mandatory">btrfs-progs</packagereq>
       <packagereq type="mandatory">coreutils</packagereq>
       <packagereq type="mandatory">cronie</packagereq>
@@ -1142,6 +1155,7 @@
       <packagereq type="mandatory">yum</packagereq>
       <packagereq type="default">aic94xx-firmware</packagereq>
       <packagereq type="default">alsa-firmware</packagereq>
+      <packagereq type="default">biosdevname</packagereq>
       <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">ivtv-firmware</packagereq>
       <packagereq type="default">iwl100-firmware</packagereq>
@@ -1168,14 +1182,15 @@
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">NetworkManager-team</packagereq>
       <packagereq type="default">NetworkManager-tui</packagereq>
-      <packagereq type="default">NetworkManager-wifi</packagereq>
+      <packagereq type="default">NetworkManager-wifi</packagereq>      
       <packagereq type="default">postfix</packagereq>
-      <packagereq type="default">rdma</packagereq>
       <packagereq type="optional">dracut-config-generic</packagereq>
       <packagereq type="optional">dracut-fips</packagereq>
       <packagereq type="optional">dracut-fips-aesni</packagereq>
       <packagereq type="optional">dracut-network</packagereq>
+      <packagereq type="optional">initial-setup</packagereq>
       <packagereq type="optional">openssh-keycat</packagereq>
+      <packagereq type="optional">rdma-core</packagereq>
       <packagereq type="optional">selinux-policy-mls</packagereq>
       <packagereq type="optional">tboot</packagereq>
     </packagelist>
@@ -1604,6 +1619,7 @@
       <packagereq type="mandatory">lrzsz</packagereq>
       <packagereq type="mandatory">ModemManager</packagereq>
       <packagereq type="mandatory">NetworkManager-adsl</packagereq>
+      <packagereq type="mandatory">NetworkManager-ppp</packagereq>
       <packagereq type="mandatory">ppp</packagereq>
       <packagereq type="mandatory">usb_modeswitch-data</packagereq>
       <packagereq type="mandatory">wvdial</packagereq>
@@ -1682,9 +1698,12 @@
       <packagereq type="default">oddjob-mkhomedir</packagereq>
       <packagereq type="default">realmd</packagereq>
       <packagereq type="default">sssd</packagereq>
+      <packagereq type="optional">clevis-dracut</packagereq>
+      <packagereq type="optional">clevis-udisks2</packagereq>
       <packagereq type="optional">krb5-pkinit</packagereq>
       <packagereq type="optional">krb5-workstation</packagereq>
       <packagereq type="optional">ldapjdk</packagereq>
+      <packagereq type="optional">luksmeta</packagereq>
       <packagereq type="optional">nscd</packagereq>
       <packagereq type="optional">nss-pam-ldapd</packagereq>
       <packagereq type="optional">openldap-clients</packagereq>
@@ -1692,7 +1711,10 @@
       <packagereq type="optional">samba-winbind</packagereq>
       <packagereq type="optional">samba-winbind-clients</packagereq>
       <packagereq type="optional">sssd-dbus</packagereq>
+      <packagereq type="optional">sssd-kcm</packagereq>
+      <packagereq type="optional">sssd-polkit-rules</packagereq>
       <packagereq type="optional">sssd-tools</packagereq>
+      <packagereq type="optional">sssd-winbind-idmap</packagereq>
     </packagelist>
   </group>
   <group>
@@ -1760,7 +1782,9 @@
       <packagereq type="optional">krb5-server</packagereq>
       <packagereq type="optional">krb5-server-ldap</packagereq>
       <packagereq type="optional">migrationtools</packagereq>
+      <packagereq type="optional">mod_session</packagereq>
       <packagereq type="optional">openldap-servers</packagereq>
+      <packagereq type="optional">python-pyasn1-modules</packagereq>
       <packagereq type="optional">samba</packagereq>
     </packagelist>
   </group>
@@ -2591,6 +2615,7 @@
       <packagereq type="mandatory">caribou-gtk2-module</packagereq>
       <packagereq type="mandatory">caribou-gtk3-module</packagereq>
       <packagereq type="mandatory">cheese</packagereq>
+      <packagereq type="mandatory">compat-cheese314</packagereq>
       <packagereq type="mandatory">control-center</packagereq>
       <packagereq type="mandatory">dconf</packagereq>
       <packagereq type="mandatory">empathy</packagereq>
@@ -2614,7 +2639,6 @@
       <packagereq type="mandatory">gnome-contacts</packagereq>
       <packagereq type="mandatory">gnome-dictionary</packagereq>
       <packagereq type="mandatory">gnome-disk-utility</packagereq>
-      <packagereq type="mandatory">gnome-documents</packagereq>
       <packagereq type="mandatory">gnome-font-viewer</packagereq>
       <packagereq type="mandatory">gnome-getting-started-docs</packagereq>
       <packagereq type="mandatory">gnome-icon-theme</packagereq>
@@ -2646,7 +2670,6 @@
       <packagereq type="mandatory">gvfs-gphoto2</packagereq>
       <packagereq type="mandatory">gvfs-mtp</packagereq>
       <packagereq type="mandatory">gvfs-smb</packagereq>
-      <packagereq type="mandatory">initial-setup</packagereq>
       <packagereq type="mandatory">initial-setup-gui</packagereq>
       <packagereq type="mandatory">libcanberra-gtk2</packagereq>
       <packagereq type="mandatory">libcanberra-gtk3</packagereq>
@@ -2669,11 +2692,11 @@
       <packagereq type="mandatory">sushi</packagereq>
       <packagereq type="mandatory">totem</packagereq>
       <packagereq type="mandatory">totem-nautilus</packagereq>
-      <packagereq type="mandatory">unoconv</packagereq>
       <packagereq type="mandatory">vinagre</packagereq>
       <packagereq type="mandatory">vino</packagereq>
       <packagereq type="mandatory">xdg-user-dirs-gtk</packagereq>
       <packagereq type="mandatory">yelp</packagereq>
+      <packagereq type="default">xdg-desktop-portal-gtk</packagereq>
       <packagereq type="optional">alacarte</packagereq>
       <packagereq type="optional">dconf-editor</packagereq>
       <packagereq type="optional">dvgrab</packagereq>
@@ -3022,6 +3045,7 @@
       <packagereq type="default">pcs</packagereq>
       <packagereq type="optional">booth-arbitrator</packagereq>
       <packagereq type="optional">booth-site</packagereq>
+      <packagereq type="optional">sbd</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3083,6 +3107,7 @@
       <packagereq type="default">rasdaemon</packagereq>
       <packagereq type="default">smartmontools</packagereq>
       <packagereq type="optional">edac-utils</packagereq>
+      <packagereq type="optional">intel-cmt-cat</packagereq>
       <packagereq type="optional">lm_sensors</packagereq>
     </packagelist>
   </group>
@@ -3219,13 +3244,15 @@
       <packagereq type="mandatory">libibverbs-utils</packagereq>
       <packagereq type="mandatory">librdmacm</packagereq>
       <packagereq type="mandatory">librdmacm-utils</packagereq>
-      <packagereq type="mandatory">rdma</packagereq>
       <packagereq type="conditional" requires="glusterfs">glusterfs-rdma</packagereq>
       <packagereq type="default">dapl</packagereq>
       <packagereq type="default">ibacm</packagereq>
       <packagereq type="default">ibutils</packagereq>
+      <packagereq type="default">infiniband-diags</packagereq>
+      <packagereq type="default">iwpmd</packagereq>
       <packagereq type="default">libcxgb3</packagereq>
       <packagereq type="default">libcxgb4</packagereq>
+      <packagereq type="default">libhfi1</packagereq>
       <packagereq type="default">libi40iw</packagereq>
       <packagereq type="default">libibmad</packagereq>
       <packagereq type="default">libibumad</packagereq>
@@ -3234,21 +3261,22 @@
       <packagereq type="default">libmlx5</packagereq>
       <packagereq type="default">libmthca</packagereq>
       <packagereq type="default">libnes</packagereq>
+      <packagereq type="default">libocrdma</packagereq>
+      <packagereq type="default">mstflint</packagereq>
+      <packagereq type="default">opa-address-resolution</packagereq>
+      <packagereq type="default">opa-fastfabric</packagereq>
+      <packagereq type="default">perftest</packagereq>
+      <packagereq type="default">qperf</packagereq>
+      <packagereq type="default">rdma-ndd</packagereq>
+      <packagereq type="default">srp_daemon</packagereq>
       <packagereq type="optional">compat-dapl</packagereq>
       <packagereq type="optional">compat-opensm-libs</packagereq>
-      <packagereq type="optional">infiniband-diags</packagereq>
-      <packagereq type="optional">iwpmd</packagereq>
-      <packagereq type="optional">libhfi1</packagereq>
       <packagereq type="optional">libibcommon</packagereq>
-      <packagereq type="optional">libocrdma</packagereq>
       <packagereq type="optional">libusnic_verbs</packagereq>
       <packagereq type="optional">libvma</packagereq>
-      <packagereq type="optional">mstflint</packagereq>
       <packagereq type="optional">opensm</packagereq>
-      <packagereq type="optional">perftest</packagereq>
-      <packagereq type="optional">qperf</packagereq>
-      <packagereq type="optional">rdma-ndd</packagereq>
-      <packagereq type="optional">srptools</packagereq>
+      <packagereq type="optional">rdma-core</packagereq>
+      <packagereq type="optional">usnic-tools</packagereq>
     </packagelist>
   </group>
   <group>
@@ -3713,7 +3741,6 @@
       <packagereq type="mandatory">firstboot</packagereq>
       <packagereq type="mandatory">gdm</packagereq>
       <packagereq type="mandatory">gwenview</packagereq>
-      <packagereq type="mandatory">initial-setup</packagereq>
       <packagereq type="mandatory">initial-setup-gui</packagereq>
       <packagereq type="mandatory">kamera</packagereq>
       <packagereq type="mandatory">kcalc</packagereq>
@@ -4600,6 +4627,7 @@
       <packagereq type="optional">rsyslog-pgsql</packagereq>
       <packagereq type="optional">rsyslog-relp</packagereq>
       <packagereq type="optional">syslinux</packagereq>
+      <packagereq type="optional">tang</packagereq>
       <packagereq type="optional">tftp-server</packagereq>
     </packagelist>
   </group>
@@ -4761,6 +4789,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="conditional" requires="gnome-session">gnome-documents</packagereq>
       <packagereq type="default">libreoffice-calc</packagereq>
       <packagereq type="default">libreoffice-draw</packagereq>
       <packagereq type="default">libreoffice-emailmerge</packagereq>
@@ -4768,6 +4797,7 @@
       <packagereq type="default">libreoffice-impress</packagereq>
       <packagereq type="default">libreoffice-math</packagereq>
       <packagereq type="default">libreoffice-writer</packagereq>
+      <packagereq type="default">unoconv</packagereq>
       <packagereq type="optional">libreoffice-base</packagereq>
       <packagereq type="optional">libreoffice-ogltrans</packagereq>
       <packagereq type="optional">libreoffice-pyuno</packagereq>
@@ -4847,11 +4877,13 @@
       <packagereq type="default">perf</packagereq>
       <packagereq type="default">powertop</packagereq>
       <packagereq type="optional">hdparm</packagereq>
+      <packagereq type="optional">iperf3</packagereq>
       <packagereq type="optional">libpfm</packagereq>
       <packagereq type="optional">oprofile-jit</packagereq>
       <packagereq type="optional">papi</packagereq>
       <packagereq type="optional">sdparm</packagereq>
       <packagereq type="optional">sg3_utils</packagereq>
+      <packagereq type="optional">tuned-profiles-cpu-partitioning</packagereq>
       <packagereq type="optional">tuned-utils</packagereq>
     </packagelist>
   </group>
@@ -4933,6 +4965,7 @@
       <packagereq type="optional">perl-homedir</packagereq>
       <packagereq type="optional">perl-LDAP</packagereq>
       <packagereq type="optional">perl-Mozilla-LDAP</packagereq>
+      <packagereq type="optional">perl-Perl4-CoreLibs</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5197,6 +5230,27 @@
       <packagereq type="mandatory">redhat-lsb</packagereq>
       <packagereq type="mandatory">xorg-x11-docs</packagereq>
       <packagereq type="mandatory">zlib-devel</packagereq>
+      <packagereq type="optional">libdb-cxx</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>platform-kvm</id>
+    <name>KVM platform specific packages</name>
+    <description>Virtualization utilities and drivers for KVM</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">qemu-guest-agent</packagereq>
+    </packagelist>
+  </group>
+  <group>
+    <id>platform-microsoft</id>
+    <name>Hyper-v platform specific packages</name>
+    <description>Virtualization utilities and drivers for Hyper-v</description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="default">hyperv-daemons</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5207,7 +5261,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="default">open-vm-tools</packagereq>
-      <packagereq type="default">open-vm-tools-desktop</packagereq>
+      <packagereq type="optional">open-vm-tools-desktop</packagereq>
     </packagelist>
   </group>
   <group>
@@ -5659,6 +5713,7 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
+      <packagereq type="default">cockpit</packagereq>
       <packagereq type="default">net-snmp</packagereq>
       <packagereq type="default">net-snmp-utils</packagereq>
       <packagereq type="default">openlmi-account</packagereq>
@@ -5985,6 +6040,7 @@
       <packagereq type="optional">tncfhh</packagereq>
       <packagereq type="optional">tpm-quote-tools</packagereq>
       <packagereq type="optional">tpm-tools</packagereq>
+      <packagereq type="optional">tpm2-tools</packagereq>
       <packagereq type="optional">trousers</packagereq>
     </packagelist>
   </group>
@@ -6051,6 +6107,7 @@
       <packagereq type="default">pam_pkcs11</packagereq>
       <packagereq type="default">pcsc-lite-ccid</packagereq>
       <packagereq type="optional">opencryptoki</packagereq>
+      <packagereq type="optional">opensc</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6670,6 +6727,7 @@
       <packagereq type="default">mod_fcgid</packagereq>
       <packagereq type="default">mod_ssl</packagereq>
       <packagereq type="optional">certmonger</packagereq>
+      <packagereq type="optional">keycloak-httpd-client-install</packagereq>
       <packagereq type="optional">libmemcached</packagereq>
       <packagereq type="optional">memcached</packagereq>
       <packagereq type="optional">mod_auth_kerb</packagereq>
@@ -6861,6 +6919,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">glx-utils</packagereq>
+      <packagereq type="mandatory">initial-setup-gui</packagereq>
       <packagereq type="mandatory">mesa-dri-drivers</packagereq>
       <packagereq type="mandatory">plymouth-system-theme</packagereq>
       <packagereq type="mandatory">spice-vdagent</packagereq>
@@ -6870,10 +6929,9 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="mandatory">xvattr</packagereq>
-      <packagereq type="optional">initial-setup</packagereq>
-      <packagereq type="optional">initial-setup-gui</packagereq>
       <packagereq type="optional">tigervnc-server</packagereq>
       <packagereq type="optional">xorg-x11-drv-keyboard</packagereq>
+      <packagereq type="optional">xorg-x11-drv-libinput</packagereq>
       <packagereq type="optional">xorg-x11-drv-mouse</packagereq>
       <packagereq type="optional">xorg-x11-drv-openchrome</packagereq>
     </packagelist>
@@ -8647,6 +8705,7 @@
       <groupid>python-web</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>technical-writing</groupid>
+      <groupid>technical-writing</groupid>
       <groupid>virtualization-hypervisor</groupid>
       <groupid>web-servlet</groupid>
     </optionlist>