From ace3032d0c1ed6f25c4f1d767a56caad5ac9beca Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Thu, 28 Aug 2014 23:57:25 +0200
Subject: [PATCH] Pull in fedora-release-standard for non-productized env
 groups

---
 comps-f21.xml.in | 22 ++++++++++++++++++++++
 comps-f22.xml.in | 22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 2854ebf1..f8279902 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -2120,6 +2120,16 @@
       <packagereq type="optional">eclipse-veditor</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>fedora-release-standard</id>
+    <_name>Generic Fedora release</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-release-standard</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>freeipa-server</id>
     <_name>FreeIPA Server</_name>
@@ -6684,6 +6694,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6712,6 +6723,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6741,6 +6753,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6769,6 +6782,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6795,6 +6809,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6820,6 +6835,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6846,6 +6862,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6868,6 +6885,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6920,6 +6938,7 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>hardware-support</groupid>
       <groupid>web-server</groupid>
     </grouplist>
@@ -6946,6 +6965,7 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
       <groupid>container-management</groupid>
@@ -7042,6 +7062,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
@@ -7072,6 +7093,7 @@
     <display_order>99</display_order>
     <grouplist>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 58597a9e..5fb8d96f 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -2107,6 +2107,16 @@
       <packagereq type="optional">eclipse-veditor</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>fedora-release-standard</id>
+    <_name>Generic Fedora release</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq>fedora-release-standard</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>freeipa-server</id>
     <_name>FreeIPA Server</_name>
@@ -6670,6 +6680,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6698,6 +6709,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6727,6 +6739,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6755,6 +6768,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6781,6 +6795,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6806,6 +6821,7 @@
       <groupid>core</groupid>
       <groupid>admin-tools</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6832,6 +6848,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6854,6 +6871,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>input-methods</groupid>
       <groupid>multimedia</groupid>
@@ -6906,6 +6924,7 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>hardware-support</groupid>
       <groupid>web-server</groupid>
     </grouplist>
@@ -6932,6 +6951,7 @@
     <grouplist>
       <groupid>standard</groupid>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>hardware-support</groupid>
       <groupid>headless-management</groupid>
       <groupid>container-management</groupid>
@@ -7027,6 +7047,7 @@
       <groupid>standard</groupid>
       <groupid>core</groupid>
       <groupid>dial-up</groupid>
+      <groupid>fedora-release-standard</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
       <groupid>multimedia</groupid>
@@ -7057,6 +7078,7 @@
     <display_order>99</display_order>
     <grouplist>
       <groupid>core</groupid>
+      <groupid>fedora-release-standard</groupid>
     </grouplist>
     <optionlist>
       <groupid>standard</groupid>