1 |
commit: ea7cd6e092def3df76f45f3ed30ecd1e4473e499 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 11 22:41:51 2018 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 11 22:41:51 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/commit/?id=ea7cd6e0 |
7 |
|
8 |
Update rnc schemas. |
9 |
|
10 |
glsa.rnc | 4 +++- |
11 |
metadata.rnc | 11 ++++++++++- |
12 |
2 files changed, 13 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/glsa.rnc b/glsa.rnc |
15 |
index a9f182a..2711a6a 100644 |
16 |
--- a/glsa.rnc |
17 |
+++ b/glsa.rnc |
18 |
@@ -128,7 +128,8 @@ vulnerable = element vulnerable { attlist.vulnerable, text } |
19 |
attlist.vulnerable &= |
20 |
attribute range { |
21 |
"le" | "lt" | "eq" | "gt" | "ge" | "rlt" | "rle" | "rgt" | "rge" |
22 |
- } |
23 |
+ }, |
24 |
+ [ a:defaultValue = "*" ] attribute slot { text }? |
25 |
# Element: unaffected |
26 |
# Description: Version of the fixed (or unaffected) package. In case the |
27 |
# package is superseded by another package, you need to |
28 |
@@ -144,6 +145,7 @@ attlist.unaffected &= |
29 |
attribute range { |
30 |
"le" | "lt" | "eq" | "gt" | "ge" | "rlt" | "rle" | "rgt" | "rge" |
31 |
}, |
32 |
+ [ a:defaultValue = "*" ] attribute slot { text }?, |
33 |
attribute name { text }? |
34 |
# Element: service |
35 |
# Description: Provide information about the Gentoo services that are |
36 |
|
37 |
diff --git a/metadata.rnc b/metadata.rnc |
38 |
index 2ac5f01..7f4c26e 100644 |
39 |
--- a/metadata.rnc |
40 |
+++ b/metadata.rnc |
41 |
@@ -10,7 +10,12 @@ attlist.catmetadata &= |
42 |
pkgmetadata = |
43 |
element pkgmetadata { |
44 |
attlist.pkgmetadata, |
45 |
- (maintainer | longdescription | slots | use | upstream)* |
46 |
+ (maintainer |
47 |
+ | longdescription |
48 |
+ | slots |
49 |
+ | stabilize-allarches |
50 |
+ | use |
51 |
+ | upstream)* |
52 |
} |
53 |
attlist.pkgmetadata &= |
54 |
[ a:defaultValue = "" ] attribute pkgname { text }? |
55 |
@@ -42,6 +47,9 @@ attlist.slot &= attribute name { text } |
56 |
# The meaning of sub-SLOTs for the whole package |
57 |
subslots = element subslots { attlist.subslots, text* } |
58 |
attlist.subslots &= empty |
59 |
+# whether it's possible to stabilize ALLARCHES |
60 |
+stabilize-allarches = |
61 |
+ element stabilize-allarches { attlist.stabilize-allarches, empty } |
62 |
# description of what this USE flag does for this package |
63 |
use = element use { attlist.use, flag* } |
64 |
flag = element flag { attlist.flag, (text | pkg | cat)* } |
65 |
@@ -128,6 +136,7 @@ attlist.use &= [ a:defaultValue = "en" ] attribute lang { text }? |
66 |
attlist.maintainer &= attribute restrict { text }? |
67 |
attlist.longdescription &= attribute restrict { text }? |
68 |
attlist.flag &= attribute restrict { text }? |
69 |
+attlist.stabilize-allarches &= attribute restrict { text }? |
70 |
# standard parts |
71 |
|
72 |
# an email address |