comps comps.rng,1.1,1.2

[Will Woods (wwoods)]

Author: wwoods

Update of /cvs/pkgs/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32393

Modified Files:
	comps.rng 
Log Message:
Drop metapkg (we don't use it in Fedora), validate .xml.in too


Index: comps.rng
===================================================================
RCS file: /cvs/pkgs/comps/comps.rng,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps.rng	26 Jun 2008 19:16:18 -0000	1.1
+++ comps.rng	26 Jun 2008 21:45:04 -0000	1.2
@@ -52,10 +52,6 @@
       <oneOrMore>
         <ref name="groupreq"/>
       </oneOrMore>
-<!-- What this part is intended to do is a deep mystery -->
-      <zeroOrMore>
-        <ref name="metapkg"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="groupreq">
@@ -64,18 +60,6 @@
       <ref name="groupname"/>
     </element>
   </define>
-  <define name="metapkg">
-    <element name="metapkg">
-      <a:documentation>This item is mysterious and not typically used in Fedora.</a:documentation>
-      <attribute name="type">
-        <choice>
-          <value>default</value>
-          <value>optional</value>
-        </choice>
-      </attribute>
-      <ref name="packagename"/>
-    </element>
-  </define>
   <define name="packagelist">
     <element name="packagelist">
       <oneOrMore>
@@ -139,28 +123,43 @@
     <element name="id">
       <ref name="ID"/>
     </element>
-    <element name="name">
-      <ref name="string"/>
-    </element>
-    <zeroOrMore>
-      <element name="name">
-        <attribute name="xml:lang">
-          <ref name="locale"/>
-        </attribute>
-        <ref name="string"/>
-      </element>
-    </zeroOrMore>
-    <element name="description">
-      <ref name="string"/>
-    </element>
-    <zeroOrMore>
-      <element name="description">
-        <attribute name="xml:lang">
-          <ref name="locale"/>
-        </attribute>
-        <ref name="string"/>
-      </element>
-    </zeroOrMore>
+    <choice>
+      <!-- Either we have one _name and one _description (comps.xml.in) -->
+      <group>
+        <element name="_name">
+          <ref name="string"/>
+        </element>
+        <element name="_description">
+          <ref name="string"/>
+        </element>
+      </group>
+      <!-- Or we have one name, one description, and then zero-or-more
+           localized names and descriptions following that. -->
+      <group>
+        <element name="name">
+          <ref name="string"/>
+        </element>
+        <zeroOrMore>
+          <element name="name">
+            <attribute name="xml:lang">
+              <ref name="locale"/>
+            </attribute>
+            <ref name="string"/>
+          </element>
+        </zeroOrMore>
+        <element name="description">
+          <ref name="string"/>
+        </element>
+        <zeroOrMore>
+          <element name="description">
+            <attribute name="xml:lang">
+              <ref name="locale"/>
+            </attribute>
+            <ref name="string"/>
+          </element>
+        </zeroOrMore>
+      </group>
+    </choice>
   </define>
   <define name="boolean">
     <choice>