|
 |
eb5f31 |
diff -up yum-3.4.3/docs/comps.rng.orig yum-3.4.3/docs/comps.rng
|
|
|
eb5f31 |
--- yum-3.4.3/docs/comps.rng.orig 2011-06-28 22:27:22.000000000 +0200
|
|
|
eb5f31 |
+++ yum-3.4.3/docs/comps.rng 2016-06-30 14:30:03.980476903 +0200
|
|
|
eb5f31 |
@@ -21,14 +21,22 @@
|
|
|
eb5f31 |
<ref name="group"/>
|
|
|
eb5f31 |
</oneOrMore>
|
|
|
eb5f31 |
<zeroOrMore>
|
|
|
eb5f31 |
+ <ref name="environment"/>
|
|
|
eb5f31 |
+ </zeroOrMore>
|
|
|
eb5f31 |
+ <zeroOrMore>
|
|
|
eb5f31 |
<ref name="category"/>
|
|
|
eb5f31 |
</zeroOrMore>
|
|
|
eb5f31 |
- <optional>
|
|
|
eb5f31 |
- <interleave>
|
|
|
eb5f31 |
+ <interleave>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
<ref name="whiteout"/>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
<ref name="blacklist"/>
|
|
|
eb5f31 |
- </interleave>
|
|
|
eb5f31 |
- </optional>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <ref name="langpacks"/>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ </interleave>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
<define name="group">
|
|
|
eb5f31 |
@@ -37,14 +45,18 @@
|
|
|
eb5f31 |
<a:documentation>This defines a package group.</a:documentation>
|
|
|
eb5f31 |
<interleave>
|
|
|
eb5f31 |
<ref name="id"/>
|
|
|
eb5f31 |
- <element name="default" a:defaultValue="true">
|
|
|
eb5f31 |
- <a:documentation>Should the group be enabled by default?</a:documentation>
|
|
|
eb5f31 |
- <ref name="boolean"/>
|
|
|
eb5f31 |
- </element>
|
|
|
eb5f31 |
- <element name="uservisible" a:defaultValue="true">
|
|
|
eb5f31 |
- <a:documentation>Should the group be visible to users?</a:documentation>
|
|
|
eb5f31 |
- <ref name="boolean"/>
|
|
|
eb5f31 |
- </element>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <element name="default" a:defaultValue="true">
|
|
|
eb5f31 |
+ <a:documentation>Should the group be enabled by default?</a:documentation>
|
|
|
eb5f31 |
+ <ref name="boolean"/>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <element name="uservisible" a:defaultValue="true">
|
|
|
eb5f31 |
+ <a:documentation>Should the group be visible to users?</a:documentation>
|
|
|
eb5f31 |
+ <ref name="boolean"/>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
<optional>
|
|
|
eb5f31 |
<element name="display_order">
|
|
|
eb5f31 |
<ref name="positiveInteger"/>
|
|
|
eb5f31 |
@@ -72,6 +84,9 @@
|
|
|
eb5f31 |
<oneOrMore>
|
|
|
eb5f31 |
<ref name="groupreq"/>
|
|
|
eb5f31 |
</oneOrMore>
|
|
|
eb5f31 |
+ <zeroOrMore>
|
|
|
eb5f31 |
+ <ref name="metapkg"/>
|
|
|
eb5f31 |
+ </zeroOrMore>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
<define name="groupreq">
|
|
|
eb5f31 |
@@ -79,23 +94,39 @@
|
|
|
eb5f31 |
<ref name="groupname"/>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
+ <define name="metapkg">
|
|
|
eb5f31 |
+ <element name="metapkg">
|
|
|
eb5f31 |
+ <ref name="packagename"/>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <attribute name="type">
|
|
|
eb5f31 |
+ <choice>
|
|
|
eb5f31 |
+ <value>mandatory</value>
|
|
|
eb5f31 |
+ <value>default</value>
|
|
|
eb5f31 |
+ <value>optional</value>
|
|
|
eb5f31 |
+ </choice>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </define>
|
|
|
eb5f31 |
<define name="packagelist">
|
|
|
eb5f31 |
<element name="packagelist">
|
|
|
eb5f31 |
- <oneOrMore>
|
|
|
eb5f31 |
+ <zeroOrMore>
|
|
|
eb5f31 |
<ref name="packagereq"/>
|
|
|
eb5f31 |
- </oneOrMore>
|
|
|
eb5f31 |
+ </zeroOrMore>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
<define name="packagereq">
|
|
|
eb5f31 |
<element name="packagereq">
|
|
|
eb5f31 |
<choice>
|
|
|
eb5f31 |
- <attribute name="type" a:defaultValue="optional">
|
|
|
eb5f31 |
- <choice>
|
|
|
eb5f31 |
- <value>mandatory</value>
|
|
|
eb5f31 |
- <value>default</value>
|
|
|
eb5f31 |
- <value>optional</value>
|
|
|
eb5f31 |
- </choice>
|
|
|
eb5f31 |
- </attribute>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <attribute name="type" a:defaultValue="optional">
|
|
|
eb5f31 |
+ <choice>
|
|
|
eb5f31 |
+ <value>mandatory</value>
|
|
|
eb5f31 |
+ <value>default</value>
|
|
|
eb5f31 |
+ <value>optional</value>
|
|
|
eb5f31 |
+ </choice>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
<group>
|
|
|
eb5f31 |
<attribute name="type" a:defaultValue="conditional">
|
|
|
eb5f31 |
<choice>
|
|
|
eb5f31 |
@@ -112,9 +143,30 @@
|
|
|
eb5f31 |
<ref name="boolean"/>
|
|
|
eb5f31 |
</attribute>
|
|
|
eb5f31 |
</optional>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <attribute name="arch">
|
|
|
eb5f31 |
+ <ref name="string"/>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
<ref name="packagename"/>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
+ <define name="environment">
|
|
|
eb5f31 |
+ <element name="environment">
|
|
|
eb5f31 |
+ <interleave>
|
|
|
eb5f31 |
+ <ref name="id"/>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <element name="display_order">
|
|
|
eb5f31 |
+ <ref name="positiveInteger"/>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ <ref name="grouplist"/>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <ref name="optionlist"/>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
+ </interleave>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </define>
|
|
|
eb5f31 |
<define name="category">
|
|
|
eb5f31 |
<element name="category">
|
|
|
eb5f31 |
<interleave>
|
|
|
eb5f31 |
@@ -135,9 +187,21 @@
|
|
|
eb5f31 |
</oneOrMore>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
+ <define name="optionlist">
|
|
|
eb5f31 |
+ <element name="optionlist">
|
|
|
eb5f31 |
+ <oneOrMore>
|
|
|
eb5f31 |
+ <ref name="groupid"/>
|
|
|
eb5f31 |
+ </oneOrMore>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </define>
|
|
|
eb5f31 |
<define name="groupid">
|
|
|
eb5f31 |
<element name="groupid">
|
|
|
eb5f31 |
<ref name="string"/>
|
|
|
eb5f31 |
+ <optional>
|
|
|
eb5f31 |
+ <attribute name="default" a:defaultValue="false">
|
|
|
eb5f31 |
+ <ref name="boolean"/>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ </optional>
|
|
|
eb5f31 |
</element>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
<define name="id">
|
|
|
eb5f31 |
@@ -182,6 +246,29 @@
|
|
|
eb5f31 |
</group>
|
|
|
eb5f31 |
</choice>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
+ <define name="langpacks">
|
|
|
eb5f31 |
+ <a:documentation>
|
|
|
eb5f31 |
+ The "langpacks" item is a list of package-to-langpack mappings used
|
|
|
eb5f31 |
+ by the yum-langpacks plugin.
|
|
|
eb5f31 |
+
|
|
|
eb5f31 |
+ An example is:
|
|
|
eb5f31 |
+ <match name="foo" install="foo-lang-%s">
|
|
|
eb5f31 |
+ When the 'foo' package is installed, the 'foo-lang-(language code)' package
|
|
|
eb5f31 |
+ will be installed for any configured languages.
|
|
|
eb5f31 |
+ </a:documentation>
|
|
|
eb5f31 |
+ <element name="langpacks">
|
|
|
eb5f31 |
+ <zeroOrMore>
|
|
|
eb5f31 |
+ <element name="match">
|
|
|
eb5f31 |
+ <attribute name="name">
|
|
|
eb5f31 |
+ <ref name="string"/>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ <attribute name="install">
|
|
|
eb5f31 |
+ <ref name="string"/>
|
|
|
eb5f31 |
+ </attribute>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </zeroOrMore>
|
|
|
eb5f31 |
+ </element>
|
|
|
eb5f31 |
+ </define>
|
|
|
eb5f31 |
<define name="blacklist">
|
|
|
eb5f31 |
<a:documentation>
|
|
|
eb5f31 |
The "blacklist" is a list of packages that will be *removed* if found
|
|
|
eb5f31 |
@@ -257,7 +344,7 @@
|
|
|
eb5f31 |
<data type="string"/>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
<define name="ID">
|
|
|
eb5f31 |
- <data type="ID"/>
|
|
|
eb5f31 |
+ <data type="string"/>
|
|
|
eb5f31 |
</define>
|
|
|
eb5f31 |
|
|
|
eb5f31 |
<define name="locale">
|
|
|
eb5f31 |
diff -up yum-3.4.3/yum.spec.orig yum-3.4.3/yum.spec
|
|
|
eb5f31 |
--- yum-3.4.3/yum.spec.orig 2016-06-30 14:30:03.980476903 +0200
|
|
|
eb5f31 |
+++ yum-3.4.3/yum.spec 2016-06-30 14:30:35.545325463 +0200
|
|
|
eb5f31 |
@@ -347,7 +347,7 @@ exit 0
|
|
|
eb5f31 |
|
|
|
eb5f31 |
%files -f %{name}.lang
|
|
|
eb5f31 |
%defattr(-, root, root, -)
|
|
|
eb5f31 |
-%doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS
|
|
|
eb5f31 |
+%doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS docs/comps.rng
|
|
|
eb5f31 |
%if %{move_yum_conf_back}
|
|
|
eb5f31 |
%config(noreplace) %{_sysconfdir}/yum.conf
|
|
|
eb5f31 |
%dir %{_sysconfdir}/yum.repos.d
|