From b4f7e942b27f38cf97ffbfdb2180893fb4e5df5a Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Dec 03 2021 11:32:38 +0000
Subject: relaxng: add 'arch' attr for <group/category/environment>


I assume it has the same meaning as for <packagereq> where it was
allowed previously.

---

diff --git a/comps.rng b/comps.rng
index 6ba5cee..e77093b 100644
--- a/comps.rng
+++ b/comps.rng
@@ -44,6 +44,9 @@
       <!-- Example documentation. Please add more. -->
       <a:documentation>This defines a package group.</a:documentation>
       <optional>
+        <ref name="arch"/>
+      </optional>
+      <optional>
         <ref name="variant"/>
       </optional>
       <interleave>
@@ -147,9 +150,7 @@
         </attribute>
       </optional>
       <optional>
-        <attribute name="arch">
-          <ref name="string"/>
-        </attribute>
+        <ref name="arch"/>
       </optional>
       <optional>
         <ref name="variant"/>
@@ -160,6 +161,9 @@
   <define name="environment">
     <element name="environment">
       <optional>
+        <ref name="arch"/>
+      </optional>
+      <optional>
         <ref name="variant"/>
       </optional>
       <interleave>
@@ -179,6 +183,9 @@
   <define name="category">
     <element name="category">
       <optional>
+        <ref name="arch"/>
+      </optional>
+      <optional>
         <ref name="variant"/>
       </optional>
       <interleave>
@@ -344,6 +351,11 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="arch">
+    <attribute name="arch">
+      <ref name="string"/>
+    </attribute>
+  </define>
   <define name="variant">
     <attribute name="variant">
       <data type="string"/>