Drop metapkg (we don't use it in Fedora), validate .xml.in too

This commit is contained in:
Will Woods 2008-06-26 21:45:04 +00:00
parent 3b0e1e9cb9
commit ad935fcbc1

View File

@ -52,10 +52,6 @@
<oneOrMore> <oneOrMore>
<ref name="groupreq"/> <ref name="groupreq"/>
</oneOrMore> </oneOrMore>
<!-- What this part is intended to do is a deep mystery -->
<zeroOrMore>
<ref name="metapkg"/>
</zeroOrMore>
</element> </element>
</define> </define>
<define name="groupreq"> <define name="groupreq">
@ -64,18 +60,6 @@
<ref name="groupname"/> <ref name="groupname"/>
</element> </element>
</define> </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"> <define name="packagelist">
<element name="packagelist"> <element name="packagelist">
<oneOrMore> <oneOrMore>
@ -139,28 +123,43 @@
<element name="id"> <element name="id">
<ref name="ID"/> <ref name="ID"/>
</element> </element>
<element name="name"> <choice>
<ref name="string"/> <!-- Either we have one _name and one _description (comps.xml.in) -->
</element> <group>
<zeroOrMore> <element name="_name">
<element name="name"> <ref name="string"/>
<attribute name="xml:lang"> </element>
<ref name="locale"/> <element name="_description">
</attribute> <ref name="string"/>
<ref name="string"/> </element>
</element> </group>
</zeroOrMore> <!-- Or we have one name, one description, and then zero-or-more
<element name="description"> localized names and descriptions following that. -->
<ref name="string"/> <group>
</element> <element name="name">
<zeroOrMore> <ref name="string"/>
<element name="description"> </element>
<attribute name="xml:lang"> <zeroOrMore>
<ref name="locale"/> <element name="name">
</attribute> <attribute name="xml:lang">
<ref name="string"/> <ref name="locale"/>
</element> </attribute>
</zeroOrMore> <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>
<define name="boolean"> <define name="boolean">
<choice> <choice>