SHA256
1
0
forked from pool/docbook_5

Accepting request 1042259 from home:thomas-schraitle:branches:Publishing

- 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
- Update to version 5.2CR1
  - #230: Add packageref attribute for all *synopsis elements
 
  no changes from the 5.2b13 reviewed by the TC

OBS-URL: https://build.opensuse.org/request/show/1042259
OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_5?expand=0&rev=36
This commit is contained in:
Thomas Schraitle 2022-12-12 07:17:42 +00:00 committed by Git OBS Bridge
parent d63a765ec0
commit 7aa3ca654e
7 changed files with 188 additions and 31 deletions

View File

@ -11,8 +11,8 @@ endif
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)
#

3
docbook-5.2CR3.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1a7bac3c9eef2121809cdd1e6de908935f8f6123b7b4b246e3451c993ad1d80c
size 727574

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8791057676a56b2c656a213ab62d6ef38dbe3b6e64e88a41dfaa9e3f67549e96
size 6113280

View File

@ -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

View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Thu Dec 8 13:36:14 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com> - 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 <thomas.schraitle@suse.com> - 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
-------------------------------------------------------------------
Wed Mar 16 15:17:56 UTC 2022 - Thomas Schraitle <thomas.schraitle@suse.com> - 5.2b12

View File

@ -16,10 +16,10 @@
#
%define schemaversions 5.0 5.1 5.2b12
%define schemaversions 5.0 5.1 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 +36,18 @@ Source6: Makefile
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-%{version}.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 +83,14 @@ The documentation for the DocBook 5.x specification (%{schemaversions})
%prep
%setup -q -n %{name} -c -T
sed -i 's_@VERSION@_%{version}_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 +116,20 @@ update-xml-catalog
%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-%{version}/release-notes
#
%dir %{xml_docbook_dir}/schema
%dir %{xml_docbook_dtd_dir}
@ -134,7 +148,7 @@ update-xml-catalog
%{xml_docbook_rng_dir}/5.1
%{xml_docbook_sch_dir}/5.1
%{xml_docbook_nvdl_dir}/5.1
#5.2b10a2
#5.2*
%{xml_docbook_sch_dir}/%{version}
%{xml_docbook_rng_dir}/%{version}
%{xml_docbook_nvdl_dir}/%{version}

View File

@ -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,26 +94,53 @@
<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/"/>
<!-- 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@/"/>
<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"/>
<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>