dtd,rng: Update DTD and RelaxNG shemas for the recently added features

2010-03-18 12:14:27 +00:00
parent 33eb3ea1d1
commit acb57ef231
2 changed files with 43 additions and 1 deletions
@@ -1560,6 +1560,9 @@
            <ref name="Date"/>
            <ref name="Version"/>
            <ref name="Comment"/>
+            <zeroOrMore>
+                <ref name="Type"/>
+            </zeroOrMore>
            <optional>
                <ref name="Requires"/>
            </optional>
@@ -1602,6 +1605,24 @@
        </element>
    </define>

+    <!-- Type -->
+    <define name="Type">
+        <element name="Type">
+            <ref name="attlist.Type"/>
+            <choice>
+                <value>security</value>
+                <value>bug</value>
+            </choice>
+        </element>
+    </define>
+
+    <!-- attlist.Type -->
+    <define name="attlist.Type" combine="interleave">
+        <optional>
+            <attribute name="package"/>
+        </optional>
+    </define>
+
    <!-- Requires -->
    <define name="Requires">
        <element name="Requires">
@@ -1614,6 +1635,7 @@
    <!-- Action -->
    <define name="Action">
        <element name="Action">
+            <ref name="attlist.Action"/>
            <choice>
                <value>reverseDependencyUpdate</value>
                <value>systemRestart</value>
@@ -1621,4 +1643,14 @@
            </choice>
        </element>
    </define>
+
+    <!-- attlist.Action -->
+    <define name="attlist.Action" combine="interleave">
+        <optional>
+            <attribute name="package"/>
+        </optional>
+        <optional>
+            <attribute name="target"/>
+        </optional>
+    </define>
 </grammar>