lets make patch rng schemas and published patches validate

diff --git a/zypp/parser/yum/schema/patch.rnc b/zypp/parser/yum/schema/patch.rnc
index a9ec1dd..4ac7a81 100644 (file)
--- a/zypp/parser/yum/schema/patch.rnc
+++ b/zypp/parser/yum/schema/patch.rnc
@@ -23,15 +23,15 @@ localized-string =
   text
 
 patch =
-  attribute engine { text },
   attribute patchid { text },
   attribute timestamp { xsd:nonNegativeInteger },
+  attribute engine { text },
   element-name,
   element-summary,
   element-description,
   element-license-to-confirm*,
   element-version,
-  dependency-block,
+  dependency-block?,
   element-category,
   element reboot-needed { empty }?,
   element package-manager { empty }?,

diff --git a/zypp/parser/yum/schema/patch.rng b/zypp/parser/yum/schema/patch.rng
index 93fc549..b04a18b 100644 (file)
--- a/zypp/parser/yum/schema/patch.rng
+++ b/zypp/parser/yum/schema/patch.rng
@@ -62,11 +62,11 @@
     <text/>
   </define>
   <define name="patch">
-    <attribute name="engine"/>
     <attribute name="patchid"/>
     <attribute name="timestamp">
       <data type="nonNegativeInteger"/>
     </attribute>
+    <attribute name="engine"/>
     <ref name="element-name"/>
     <ref name="element-summary"/>
     <ref name="element-description"/>
@@ -74,7 +74,9 @@
       <ref name="element-license-to-confirm"/>
     </zeroOrMore>
     <ref name="element-version"/>
-    <ref name="dependency-block"/>
+    <optional>
+      <ref name="dependency-block"/>
+    </optional>
     <ref name="element-category"/>
     <optional>
       <element name="reboot-needed">

diff --git a/zypp/parser/yum/schema/primary.rnc b/zypp/parser/yum/schema/primary.rnc
index 784e81c..a92df0e 100644 (file)
--- a/zypp/parser/yum/schema/primary.rnc
+++ b/zypp/parser/yum/schema/primary.rnc
@@ -58,7 +58,7 @@ element-version =
     element version { version }
 
 version =
-    attribute epoch { xsd:nonNegativeInteger },
+    attribute epoch { xsd:nonNegativeInteger }?,
     attribute ver { text },
     attribute rel { text },
     empty

diff --git a/zypp/parser/yum/schema/primary.rng b/zypp/parser/yum/schema/primary.rng
index ccaf03a..a1095dc 100644 (file)
--- a/zypp/parser/yum/schema/primary.rng
+++ b/zypp/parser/yum/schema/primary.rng
@@ -75,9 +75,11 @@
     </element>
   </define>
   <define name="version">
-    <attribute name="epoch">
-      <data type="nonNegativeInteger"/>
-    </attribute>
+    <optional>
+      <attribute name="epoch">
+        <data type="nonNegativeInteger"/>
+      </attribute>
+    </optional>
     <attribute name="ver"/>
     <attribute name="rel"/>
     <empty/>

diff --git a/zypp/parser/yum/schema/suse-primary.rnc b/zypp/parser/yum/schema/suse-primary.rnc
index d7e8d4e..7656744 100644 (file)
--- a/zypp/parser/yum/schema/suse-primary.rnc
+++ b/zypp/parser/yum/schema/suse-primary.rnc
@@ -116,3 +116,6 @@ freshens =
 
 element-install-only =
     element install-only { empty }
+
+element-license-to-confirm =
+    element license-to-confirm { localized-string }
\ No newline at end of file

diff --git a/zypp/parser/yum/schema/suse-primary.rng b/zypp/parser/yum/schema/suse-primary.rng
index 0698a13..186ff2f 100644 (file)
--- a/zypp/parser/yum/schema/suse-primary.rng
+++ b/zypp/parser/yum/schema/suse-primary.rng
@@ -282,4 +282,9 @@
       <empty/>
     </element>
   </define>
+  <define name="element-license-to-confirm">
+    <element name="license-to-confirm">
+      <ref name="localized-string"/>
+    </element>
+  </define>
 </grammar>