2 commits - comps-f19.xml.in comps-f20.xml.in

[Adam Williamson]

 comps-f19.xml.in |   10 ++++++++++
 comps-f20.xml.in |   18 ++++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 82343fab40d7e5abec6a56a51cd58bad6fd162e9
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri May 31 13:57:08 2013 -0700

    add a note explaining anaconda-tools so we don't keep forgetting

diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index aa19bec..54ec4de 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -1018,6 +1018,16 @@
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
+  <!-- 
+    Note: The anaconda-tools group lists packages that anaconda might
+    add to the installed package set, depending on the installation
+    configuration chosen: the packages in this group are included in
+    the DVD package payload and the live images, but not in the runtime
+    anaconda environment. If a package is needed in anaconda's runtime
+    environment it should be listed as a dependency of the anaconda
+    package, not added to this group. See
+    https://fedorahosted.org/rel-eng/ticket/5195 .
+  -->
   <group>
     <id>anaconda-tools</id>
     <_name>Anaconda tools</_name>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index d90783e..a060095 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -1019,6 +1019,16 @@
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
   </group>
+  <!-- 
+    Note: The anaconda-tools group lists packages that anaconda might
+    add to the installed package set, depending on the installation
+    configuration chosen: the packages in this group are included in
+    the DVD package payload and the live images, but not in the runtime
+    anaconda environment. If a package is needed in anaconda's runtime
+    environment it should be listed as a dependency of the anaconda
+    package, not added to this group. See
+    https://fedorahosted.org/rel-eng/ticket/5195 .
+  -->
   <group>
     <id>anaconda-tools</id>
     <_name>Anaconda tools</_name>


commit 66956e2de85d1e3851b32efb61a5a59c5661b9f1
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri May 31 13:19:35 2013 -0700

    update anaconda-tools for changes since f17-era

diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index b8c085b..d90783e 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -1029,8 +1029,7 @@
       <packagereq>arm-boot-config</packagereq>
       <packagereq>authconfig</packagereq>
       <packagereq>btrfs-progs</packagereq>
-      <packagereq>chkconfig</packagereq>
-      <packagereq>cryptsetup</packagereq>
+      <packagereq>cryptsetup-luks</packagereq>
       <packagereq>device-mapper-multipath</packagereq>
       <packagereq>dmraid</packagereq>
       <packagereq>dosfstools</packagereq>
@@ -1038,6 +1037,7 @@
       <packagereq>e2fsprogs</packagereq>
       <packagereq>efibootmgr</packagereq>
       <packagereq>fcoe-utils</packagereq>
+      <packagereq>firewalld</packagereq>
       <packagereq>gfs2-utils</packagereq>
       <packagereq>grub2</packagereq>
       <packagereq>grub2-efi</packagereq>
@@ -1047,12 +1047,12 @@
       <packagereq>mactel-boot</packagereq>
       <packagereq>mdadm</packagereq>
       <packagereq>ntfsprogs</packagereq>
+      <packagereq>realmd</packagereq>
       <packagereq>reiserfs-utils</packagereq>
       <packagereq>s390utils</packagereq>
       <packagereq>s390utils-base</packagereq>
       <packagereq>shim</packagereq>
-      <packagereq>silo</packagereq>
-      <packagereq>system-config-firewall-base</packagereq>
+      <packagereq>syslinux-extlinux</packagereq>
       <packagereq>uboot-beagle</packagereq>
       <packagereq>uboot-beaglebone</packagereq>
       <packagereq>uboot-origen</packagereq>