Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docbook_5 for openSUSE:Factory checked in at 2022-12-13 18:54:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook_5 (Old) and /work/SRC/openSUSE:Factory/.docbook_5.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook_5" Tue Dec 13 18:54:59 2022 rev:32 rq:1042495 version:5.2cr3 Changes: -------- --- /work/SRC/openSUSE:Factory/docbook_5/docbook_5.changes 2022-03-19 22:19:48.556715459 +0100 +++ /work/SRC/openSUSE:Factory/.docbook_5.new.1835/docbook_5.changes 2022-12-13 18:55:16.603142234 +0100 @@ -1,0 +2,40 @@ +Thu Dec 8 13:36:14 UTC 2022 - Thomas Schraitle <[email protected]> - 5.2CR3 + +- Update to version 5.2CR3 + - PR #237 Allow namespace qualified attributes in non-DB namespaces + - Add <modifier> after the main names in many OO classes + - Some improvements for tests + +- Update to version 5.2CR2 + - Added many new elements, for example meta, danger, enumsynopsis + - Added otherclass attribute to article + - Added otherclass attribute to section elements to support other values. + - Added optional type attribute (text) to procedure element. + - Added a type attribute to table and informaltable elements (CALS and HTML + table syntax) + - Added trans:idfixup, trans:suffix, and trans:linkscope to common attributes. + - Changed abstract content from db.para.blocks+ to db.all.blocks+ to expand + its content model + + Find the complete list in the release-notes folder + +- Package changes + - Add the release-notes folder in the spec file + - Add %check section in spec file for a minimal test + - Correct version information in Makefile to create the correct link + - Add @VERSION@ placeholder in XML catalog file docbook_5.xml which is + replaced during build time + - Add https://cdn.docbook.org/schema/<VERSION> in the XML catalog file + docbook_5.xml + - Update docbook_5-README.SUSE + +------------------------------------------------------------------- +Mon May 30 09:16:33 UTC 2022 - Thomas Schraitle <[email protected]> - 5.2CR1 + +- Update to version 5.2CR1 + - #230: Add packageref attribute for all *synopsis elements + + no changes from the 5.2b13 reviewed by the TC + + +------------------------------------------------------------------- Old: ---- docbook-5.2b12.tar.bz2 New: ---- docbook-5.2CR3.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook_5.spec ++++++ --- /var/tmp/diff_new_pack.ytqStK/_old 2022-12-13 18:55:17.371146332 +0100 +++ /var/tmp/diff_new_pack.ytqStK/_new 2022-12-13 18:55:17.375146353 +0100 @@ -16,10 +16,11 @@ # -%define schemaversions 5.0 5.1 5.2b12 +%define schemaversions 5.0 5.1 5.2CR3 +%define realversion 5.2CR3 # Name: docbook_5 -Version: 5.2b12 +Version: 5.2cr3 Release: 0 Summary: DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x License: SUSE-Oasis-Specification-Notice @@ -36,16 +37,18 @@ Source500: docbook-5.0.tar.bz2 # DB 5.1 Source510: docbook-5.1.tar.bz2 -# -Source520: docbook-%{version}.tar.bz2 +# DB 5.2 +Source520: docbook-%{realversion}.zip # PATCH-FIX-OPENSUSE docbook_5-nvdl.patch change path to schema files Patch501: %{name}-nvdl.patch # BuildRequires: fdupes +BuildRequires: libxml2-tools BuildRequires: sgml-skel +BuildRequires: unzip Requires: sgml-skel >= 0.7 Requires(post): sgml-skel >= 0.7 -Requires(postun): sgml-skel >= 0.7 +Requires(postun):sgml-skel >= 0.7 BuildArch: noarch %description @@ -81,13 +84,14 @@ %prep %setup -q -n %{name} -c -T +sed -i 's_@VERSION@_%{realversion}_g' %{SOURCE1} # Copy catalog, README, and Makefile cp -p %{SOURCE1} %{SOURCE2} %{SOURCE6} . # Unpack the sources: tar -xf %{SOURCE500} tar -xf %{SOURCE510} -tar -xf %{SOURCE520} +unzip %{SOURCE520} # Unpack the documentation: tar -xf %{SOURCE3} tar -xf %{SOURCE4} @@ -113,9 +117,20 @@ %postun update-xml-catalog +%check +%define catalog %{buildroot}%{xml_sysconf_dir}/catalog.d/docbook_5.xml +if [ -e %{catalog} ]; then + xmlcatalog %{catalog} http://www.oasis-open.org/docbook/xml/5.2/rng/docbook.rnc + exit 0 +else + exit 10 +fi + %files %config %{xml_sysconf_dir}/catalog.d/docbook_5.xml %doc *README* +%doc docbook-%{realversion}/release-notes + # %dir %{xml_docbook_dir}/schema %dir %{xml_docbook_dtd_dir} @@ -134,10 +149,10 @@ %{xml_docbook_rng_dir}/5.1 %{xml_docbook_sch_dir}/5.1 %{xml_docbook_nvdl_dir}/5.1 -#5.2b10a2 -%{xml_docbook_sch_dir}/%{version} -%{xml_docbook_rng_dir}/%{version} -%{xml_docbook_nvdl_dir}/%{version} +#5.2* +%{xml_docbook_sch_dir}/%{realversion} +%{xml_docbook_rng_dir}/%{realversion} +%{xml_docbook_nvdl_dir}/%{realversion} #5.2 %{xml_docbook_sch_dir}/5.2 %{xml_docbook_rng_dir}/5.2 ++++++ Makefile ++++++ --- /var/tmp/diff_new_pack.ytqStK/_old 2022-12-13 18:55:17.415146567 +0100 +++ /var/tmp/diff_new_pack.ytqStK/_new 2022-12-13 18:55:17.419146588 +0100 @@ -11,8 +11,8 @@ SHELL := /bin/bash PACKAGE := docbook_5 -VERSION := 5.2b12 -DB_VERSIONS := 5.0 5.1 5.2b12 +VERSION := 5.2CR3 +DB_VERSIONS := 5.0 5.1 5.2CR3 LAST_VER := $(lastword $(DB_VERSIONS)) CDIR := $(shell pwd) # ++++++ docbook_5-README.SUSE ++++++ --- /var/tmp/diff_new_pack.ytqStK/_old 2022-12-13 18:55:17.455146780 +0100 +++ /var/tmp/diff_new_pack.ytqStK/_new 2022-12-13 18:55:17.459146801 +0100 @@ -1,10 +1,66 @@ -README.SUSE (2017-10-12) -===================================== +README.SUSE (2022-12-08) +======================== -XML CATALOG File +XML Catalog File ---------------- -The main DocBook catalog is located in /etc/xml/catalog.d/docbook_5.xml +The main DocBook catalog is located in `/etc/xml/catalog.d/docbook_5.xml`. +However, in most cases you will point your catalog resolver to the file +`/etc/xml/catalog`. + +The following URIs are supported and point to the same local path: + +* http://www.oasis-open.org/docbook/xml/<DB_VERSION>/ +* http://www.docbook.org/xml/<DB_VERSION>/ +* http://docbook.org/xml/<DB_VERSION>/ +* https://cdn.docbook.org/schema/<DB_VERSION>/ + +The structure of the DocBook schemas are shown in the following overview: + +/usr/share/xml/docbook/schema/ +âââ dtd +â  âââ 4.1.2 +â  âââ 4.2 +â  âââ 4.3 +â  âââ 4.4 +â  âââ 4.5 +â  âââ 5.0 +âââ nvdl +â  âââ 5.0 +â  âââ 5.1 +â  âââ 5.2 +âââ rng +â  âââ 4.2 +â  âââ 4.3 +â  âââ 4.4 +â  âââ 4.5 +â  âââ 5.0 +â  âââ 5.1 +â  âââ 5.2 +âââ sch +â  âââ 5.0 +â  âââ 5.1 +â  âââ 5.2 +âââ xsd + âââ 4.2 + âââ 4.3 + âââ 4.4 + âââ 4.5 + âââ 5.0 + + +DocBook V5.2 +------------ + +The significant differences from 5.1 to 5.2 are: + +* Many new synopsis elements for programming languages. +* New danger admonition element. +* New formalgroup element to support subfigures, etc. +* New transclusion fixup attributes. +* New class attribute on sectioning elements support legal sections. +* New meta element added to info. +* Added XInclude-enabled schema versions of Assembly and BITS schemas. DocBook V5.1 ++++++ docbook_5.xml ++++++ --- /var/tmp/diff_new_pack.ytqStK/_old 2022-12-13 18:55:17.479146908 +0100 +++ /var/tmp/diff_new_pack.ytqStK/_new 2022-12-13 18:55:17.483146930 +0100 @@ -35,9 +35,19 @@ <rewriteSystem systemIdStartString="http://docbook.org/xml/5.0/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.0/"/> <rewriteURI uriStartString="http://docbook.org/xml/5.0/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.0/"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.0/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.0/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.0/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.0"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.0/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.0/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.0/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.0"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.0/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.0/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.0/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.0"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.0/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.0/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.0/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.0"/> + <system systemId="http://www.oasis-open.org/docbook/xml/5.0/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.0/docbook.nvdl"/> <system systemId="http://docbook.org/xml/5.0/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.0/docbook.nvdl"/> <system systemId="http://www.docbook.org/xml/5.0/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.0/docbook.nvdl"/> + <system systemId="https://cdn.docbook.org/schema/5.0/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.0/docbook.nvdl"/> <!-- Version 5.1 --> @@ -55,9 +65,19 @@ <rewriteSystem systemIdStartString="http://docbook.org/xml/5.1/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.1/"/> <rewriteURI uriStartString="http://docbook.org/xml/5.1/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.1/"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.1/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.1/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.1/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.1"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.1/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.1/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.1/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.1"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.1/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.1/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.1/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.1"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.1/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.1/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.1/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.1"/> + <system systemId="http://www.oasis-open.org/docbook/xml/5.1/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.1/docbook.nvdl"/> <system systemId="http://docbook.org/xml/5.1/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.1/docbook.nvdl"/> <system systemId="http://www.docbook.org/xml/5.1/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.1/docbook.nvdl"/> + <system systemId="https://cdn.docbook.org/schema/5.1/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.1/docbook.nvdl"/> <!-- Version 5.2 --> @@ -74,27 +94,54 @@ <rewriteSystem systemIdStartString="http://docbook.org/xml/5.2/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2/"/> <rewriteURI uriStartString="http://docbook.org/xml/5.2/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2/"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.2/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.2/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.2/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/5.2"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.2/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.2/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.2/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.2/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/5.2/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.2/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/5.2/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/5.2"/> + <system systemId="http://www.oasis-open.org/docbook/xml/5.2/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2/docbook.nvdl"/> <system systemId="http://docbook.org/xml/5.2/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2/docbook.nvdl"/> <system systemId="http://www.docbook.org/xml/5.2/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2/docbook.nvdl"/> + <system systemId="https://cdn.docbook.org/schema/5.2/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2/docbook.nvdl"/> - <!-- Version 5.2b12 --> - <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/5.2b12/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2b12/"/> - <rewriteSystem systemIdStartString="http://www.docbook.org/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteURI uriStartString="http://www.docbook.org/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteSystem systemIdStartString="http://www.docbook.org/xml/5.2b12/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2b12/"/> - <rewriteURI uriStartString="http://www.docbook.org/xml/5.2b12/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2b12/"/> - <rewriteSystem systemIdStartString="http://docbook.org/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteURI uriStartString="http://docbook.org/xml/5.2b12/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/5.2b12/"/> - <rewriteSystem systemIdStartString="http://docbook.org/xml/5.2b12/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2b12/"/> - <rewriteURI uriStartString="http://docbook.org/xml/5.2b12/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/5.2b12/"/> - - <system systemId="http://www.oasis-open.org/docbook/xml/5.2b12/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2b12/docbook.nvdl"/> - <system systemId="http://docbook.org/xml/5.2b12/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2b12/docbook.nvdl"/> - <system systemId="http://www.docbook.org/xml/5.2b12/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/5.2b12/docbook.nvdl"/> + <!-- Version @VERSION@ --> + <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://www.docbook.org/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteURI uriStartString="http://www.docbook.org/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://www.docbook.org/xml/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + <rewriteURI uriStartString="http://www.docbook.org/xml/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://docbook.org/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteURI uriStartString="http://docbook.org/xml/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://docbook.org/xml/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + <rewriteURI uriStartString="http://docbook.org/xml/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + + <rewriteURI uriStartString="https://cdn.docbook.org/schema/@VERSION@/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/@VERSION@/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/@VERSION@/dtd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/dtd/@VERSION@"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/@VERSION@/rng/"; rewritePrefix="file:///usr/share/xml/docbook/schema/rng/@VERSION@"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/@VERSION@/sch/"; rewritePrefix="file:///usr/share/xml/docbook/schema/sch/@VERSION@"/> + <rewriteURI uriStartString="https://cdn.docbook.org/schema/@VERSION@/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/@VERSION@/"/> + <rewriteSystem systemIdStartString="https://cdn.docbook.org/schema/@VERSION@/xsd/"; rewritePrefix="file:///usr/share/xml/docbook/schema/xsd/@VERSION@"/> + + <system systemId="http://www.oasis-open.org/docbook/xml/@VERSION@/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/@VERSION@/docbook.nvdl"/> + <system systemId="http://docbook.org/xml/@VERSION@/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/@VERSION@/docbook.nvdl"/> + <system systemId="http://www.docbook.org/xml/@VERSION@/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/@VERSION@/docbook.nvdl"/> + <system systemId="https://cdn.docbook.org/schema/@VERSION@/docbook.nvdl"; uri="file:///usr/share/xml/docbook/schema/nvdl/@VERSION@/docbook.nvdl"/> </group> + + <group> + <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/5.2CR2/"; rewritePrefix="http://www.oasis-open.org/docbook/xml/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/5.2CR1/"; rewritePrefix="http://www.oasis-open.org/docbook/xml/@VERSION@/"/> + <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/5.2b12/"; rewritePrefix="http://www.oasis-open.org/docbook/xml/@VERSION@/"/> + </group> + </catalog>
