From 1a1becaaebe3ebca803de289f5728c12052264a6abdd3869236119bdcd4775cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 12:09:08 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main docbook_5 revision 80b785fdc0bd0c27c779df88cb435e04 --- .gitattributes | 23 +++ Makefile | 170 ++++++++++++++++++++++ check-catalog.sh | 175 +++++++++++++++++++++++ docbook-5.0-docs.tar.bz2 | 3 + docbook-5.0.tar.bz2 | 3 + docbook-5.1-docs.tar.bz2 | 3 + docbook-5.1.tar.bz2 | 3 + docbook-5.2CR5.zip | 3 + docbook_5-README.SUSE | 78 ++++++++++ docbook_5-nvdl.patch | 35 +++++ docbook_5.changes | 301 +++++++++++++++++++++++++++++++++++++++ docbook_5.spec | 171 ++++++++++++++++++++++ docbook_5.xml | 149 +++++++++++++++++++ 13 files changed, 1117 insertions(+) create mode 100644 .gitattributes create mode 100644 Makefile create mode 100644 check-catalog.sh create mode 100644 docbook-5.0-docs.tar.bz2 create mode 100644 docbook-5.0.tar.bz2 create mode 100644 docbook-5.1-docs.tar.bz2 create mode 100644 docbook-5.1.tar.bz2 create mode 100644 docbook-5.2CR5.zip create mode 100644 docbook_5-README.SUSE create mode 100644 docbook_5-nvdl.patch create mode 100644 docbook_5.changes create mode 100644 docbook_5.spec create mode 100644 docbook_5.xml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2b270ee --- /dev/null +++ b/Makefile @@ -0,0 +1,170 @@ +# +# Makefile to install DocBook 5.x +# +# Author: +# Thomas Schraitle +# + +ifndef PREFIX + PREFIX := /usr +endif + +SHELL := /bin/bash +PACKAGE := docbook_5 +VERSION := 5.2CR5 +DB_VERSIONS := 5.0 5.1 5.2CR5 +LAST_VER := $(lastword $(DB_VERSIONS)) +CDIR := $(shell pwd) +# +DATADIR := $(DESTDIR)$(PREFIX)/share +# +BINDIR := $(DESTDIR)$(PREFIX)/bin +# Catalog stuff +DB_CATALOG_SRC := $(PACKAGE).xml +XML_CATALOG_DIR := $(DESTDIR)/etc/xml/catalog.d +DB_CATALOG := $(XML_CATALOG_DIR)/$(DB_CATALOG_SRC) +# +DB_XML_PATH := $(DATADIR)/xml/docbook +SCHEMA_PATH := $(DB_XML_PATH)/schema +# +XSLT_PATH := $(DB_XML_PATH)/stylesheet/upgrade +# +DTD_PATH := $(SCHEMA_PATH)/dtd +XSD_PATH := $(SCHEMA_PATH)/xsd +RNG_PATH := $(SCHEMA_PATH)/rng +SCH_PATH := $(SCHEMA_PATH)/sch +NVDL_PATH := $(SCHEMA_PATH)/nvdl +# +DB_DTD_PATHS := $(DTD_PATH)/5.0 +DB_XSD_PATHS := $(XSD_PATH)/5.0 +DB_RNG_PATHS := $(foreach v,$(DB_VERSIONS),$(RNG_PATH)/$(v)) +DB_SCH_PATHS := $(foreach v,$(DB_VERSIONS),$(SCH_PATH)/$(v)) +DB_NVDL_PATHS := $(foreach v,$(DB_VERSIONS),$(NVDL_PATH)/$(v)) + + +INST_DIRECTORIES := $(XML_CATALOG_DIR) $(BINDIR) $(XSLT_PATH) \ + $(DB_DTD_PATHS) $(DB_XSD_PATHS) $(DB_RNG_PATHS) $(DB_SCH_PATHS) $(DB_NVDL_PATHS) + +DTD_SCHEMAS := $(wildcard docbook-5.0/dtd/*.dtd) +DTD_SCHEMAS := $(patsubst docbook-5.0/dtd/%,%,$(DTD_SCHEMAS)) +DTD_SCHEMAS := $(addprefix $(DB_DTD_PATHS)/,$(DTD_SCHEMAS)) +# +XSD_SCHEMAS := $(wildcard docbook-5.0/xsd/*.xsd) +XSD_SCHEMAS := $(patsubst docbook-5.0/xsd/%,%,$(XSD_SCHEMAS)) +XSD_SCHEMAS := $(addprefix $(DB_XSD_PATHS)/,$(XSD_SCHEMAS)) +# +NVDL_SCHEMAS := $(wildcard $(foreach v,$(DB_VERSIONS),docbook-$(v)/*.nvdl)) +NVDL_SCHEMAS := $(subst docbook-,,$(NVDL_SCHEMAS)) +NVDL_SCHEMAS := $(addprefix $(NVDL_PATH)/,$(NVDL_SCHEMAS)) +# +SCH_SCHEMAS := $(wildcard $(foreach p,$(DB_VERSIONS),docbook-$(p)/sch/*)) +SCH_SCHEMAS := $(patsubst docbook-%,%,$(SCH_SCHEMAS)) +SCH_SCHEMAS := $(subst sch/,,$(SCH_SCHEMAS)) +SCH_SCHEMAS := $(addprefix $(SCH_PATH)/,$(SCH_SCHEMAS)) +# +RNG_SCHEMAS := $(wildcard $(foreach p,$(DB_VERSIONS),docbook-$(p)/rng/*.rn?)) +RNG_SCHEMAS := $(patsubst docbook-%,%,$(RNG_SCHEMAS)) +RNG_SCHEMAS := $(subst rng/,,$(RNG_SCHEMAS)) +RNG_SCHEMAS := $(addprefix $(RNG_PATH)/,$(RNG_SCHEMAS)) +# +LINKS := $(foreach v,$(DB_VERSIONS),$(NVDL_PATH)/$(v)/docbook.rng \ + $(NVDL_PATH)/$(v)/docbook.sch) +COMPAT_LINKS := $(NVDL_PATH)/5.2 $(RNG_PATH)/5.2 $(SCH_PATH)/5.2 +ALL_DB_SCHEMAS := $(DTD_SCHEMAS) $(XSD_SCHEMAS) \ + $(RNG_SCHEMAS) $(SCH_SCHEMAS) $(NVDL_SCHEMAS) \ + $(LINKS) + +#----------------------------- +# Make relative path +define relpath = + $(shell realpath --relative-to $(dir $(2)) $(dir $(1))) +endef + +#----------------------------- +.PHONY: install +install: $(DB_CATALOG) +install: $(BINDIR)/db4-entities.pl +install: $(XSLT_PATH)/db4-upgrade.xsl +install: $(ALL_DB_SCHEMAS) +install: $(COMPAT_LINKS) +install: | $(INST_DIRECTORIES) + @echo "Ready." + +$(DTD_PATH)/5.0/%: docbook-5.0/dtd/% | $(DB_DTD_PATHS) + @echo "### Installing DTD $<" + install -m644 $< $@ +$(XSD_PATH)/5.0/%: docbook-5.0/xsd/% | $(DB_XSD_PATHS) + @echo "### Installing XSD $<" + install -m644 $< $@ + +$(RNG_PATH)/5.0/%: docbook-5.0/rng/% | $(DB_RNG_PATHS) + @echo "### Installing RNG 5.0 $<" + install -m644 $< $@ +$(RNG_PATH)/5.1/%: docbook-5.1/rng/% | $(DB_RNG_PATHS) + @echo "### Installing RNG 5.1 $<" + install -m644 $< $@ + +$(RNG_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/rng/% | $(DB_RNG_PATHS) + @echo "### Installing RNG $(LAST_VER) $<" + install -m644 $< $@ + +$(SCH_PATH)/5.0/%: docbook-5.0/sch/% | $(DB_SCH_PATHS) + @echo "### Installing Schematron 5.0 $<" + install -m644 $< $@ +$(SCH_PATH)/5.1/%: docbook-5.1/sch/% | $(DB_SCH_PATHS) + @echo "### Installing Schematron 5.1 $<" + install -m644 $< $@ + +$(SCH_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/sch/%| $(DB_SCH_PATHS) + @echo "### Installing Schematron $(LAST_VER) $<" + install -m644 $< $@ + +$(NVDL_PATH)/5.0/%: docbook-5.0/% | $(DB_NVDL_PATHS) + @echo "### Installing NVDL 5.0 $<" + install -m644 $< $@ +$(NVDL_PATH)/5.1/%: docbook-5.1/% | $(DB_NVDL_PATHS) + @echo "### Installing NVDL 5.1 $<" + install -m644 $< $@ + +$(NVDL_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/% | $(DB_NVDL_PATHS) + @echo "### Installing NVDL $(LAST_VER) $<" + install -m644 $< $@ + +define NVDL_LINK_tmpl = +$(NVDL_PATH)/$(1)/docbook.$(3): $(2)/$(1)/docbook.$(3) + @echo $$< $$@ + ln -s $$(call relpath,$$<,$$@)/$$(notdir $$<) $$@ +endef +$(foreach v,$(DB_VERSIONS),$(eval $(call NVDL_LINK_tmpl,$(v),$(RNG_PATH),rng))) +$(foreach v,$(DB_VERSIONS),$(eval $(call NVDL_LINK_tmpl,$(v),$(SCH_PATH),sch))) + + +$(DB_CATALOG): $(DB_CATALOG_SRC) | $(XML_CATALOG_DIR) + @echo "### Installing XML Catalog..." + install -m644 $< $@ + +$(BINDIR)/db4-entities.pl: docbook-5.1/tools/db4-entities.pl | $(BINDIR) + @echo "### Installing script db4-entities.pl" + install -m755 $< $@ + +$(XSLT_PATH)/db4-upgrade.xsl: docbook-5.1/tools/db4-upgrade.xsl | $(XSLT_PATH) + @echo "### Installing upgrade stylesheet..." + install -m644 $< $@ + +$(NVDL_PATH)/5.2: $(NVDL_PATH)/$(LAST_VER) | $(DB_NVDL_PATHS) + @echo "### Creating a link to $(NVDL_PATH)/5.2" + ln -sv --relative $< $@ + +$(RNG_PATH)/5.2: $(RNG_PATH)/$(LAST_VER) | $(DB_RNG_PATHS) + @echo "### Creating a link to $(RNG_PATH)/5.2" + ln -sv --relative $< $@ + +$(SCH_PATH)/5.2: $(SCH_PATH)/$(LAST_VER) | $(DB_SCH_PATHS) + @echo "### Creating a link to $(SCH_PATH)/5.2" + ln -sv --relative $< $@ + + +# create needed directories +# +$(INST_DIRECTORIES): + @mkdir -p $@ diff --git a/check-catalog.sh b/check-catalog.sh new file mode 100644 index 0000000..3ef65ea --- /dev/null +++ b/check-catalog.sh @@ -0,0 +1,175 @@ +#!/bin/bash +# +# Checks catalog URIs +# +# Dependencies: +# * xmlstarlet +# +# Copyright 2023 SUSE Linux Products GmbH +# Author: Tom Schraitle 2023 + +ME=${0##*/} +BUILDROOT="" +ERRORS=() + +function usage() +{ +cat << EOF +$ME [--buildroot=BUILDROOT] CATALOG_FILE + +Checks catalog URIs + +Options + --root Used when building a package, points + to the build root + +Arguments + CATALOG_FILE XML catalog file with catalog entries + +Return codes + 0 everything fine. Celebrate! \o/ + 10 catalog file doesn't exist + 100 some catalog error occured +EOF +} + +function resolveuri() { + local catalog="$1" + local uri="$2" + xmlcatalog "$catalog" "$uri" 2>/dev/null +} + +function xpathfromcatalog() { + local catalog="$1" + local xpath="$2" + local NS="urn:oasis:names:tc:entity:xmlns:xml:catalog" + xml sel --text -N c=$NS -t -v "$xpath" "$catalog" +} + + +# -- CLI parsing +ARGS=$(getopt -o h -l help,buildroot: -n "$ME" -- "$@") +eval set -- "$ARGS" +while true; do + case "$1" in + --help|-h) + usage + exit 0 + ;; + --buildroot) + # Ensure that path ends with "/" + BUILDROOT="${2%/}/" + shift 2 + ;; + --) shift ; break ;; + *) exit_on_error "Wrong parameter: $1" ;; + esac +done + + +CATALOG="$1" + +if [ ! -e "$CATALOG" ]; then + printf "Catalog file '$CATALOG' doesn't exist" >/dev/stderr + exit 10 +fi + + +declare -A TO_CHECK=( + #------------- + [5.0/nvdl]="docbook.nvdl" + [5.0/rng]="docbook.rnc docbook.rng docbookxi.rnc docbookxi.rng" + [5.0/sch]="docbook.sch" + [5.0/xsd]="docbook.xsd xlink.xsd xml.xsd" + #------------- + [5.1/nvdl]="docbook.nvdl" + [5.1/rng]="assembly.rnc assembly.rng dbits.rnc dbits.rng docbook.rnc docbook.rng docbookxi.rnc docbookxi.rng" + [5.1/sch]="assembly.sch dbits.sch docbook.sch docbookxi.sch" + #------------- + [5.2/nvdl]="assembly.nvdl dbits.nvdl docbook.nvdl" + [5.2/rng]="assembly.rnc assembly.rng assemblyxi.rnc assemblyxi.rng dbits.rnc dbits.rng dbitsxi.rnc dbitsxi.rng docbook.rnc docbook.rng docbookxi.rnc docbookxi.rng" + [5.2/sch]="assembly.sch assemblyxi.sch dbits.sch docbook.sch docbookxi.sch" + #------------- +) + +SYSTEMS=$(xpathfromcatalog "$CATALOG" \ + "//c:system/@systemId") + +# +for uri in $SYSTEMS; do + next=$(( "${#ERRORS[@]}" + 1 )) + result=$(resolveuri "$CATALOG" "$uri") + if [[ $? -ne 0 ]]; then + result="" + ERRORS[next]="$uri" + else + result="${BUILDROOT}${result#file://*}" + + if [[ $ret -ne 0 ]]; then + result="" + ERRORS[next]="$uri/$file" + elif [[ ! -e $result ]]; then + ERRORS[next]="$result" + fi + fi + +done + + +REWRITESYSTEMS=$(xpathfromcatalog "$CATALOG" \ + "//c:rewriteSystem/@systemIdStartString") + +for uri in $REWRITESYSTEMS; do + result=$(resolveuri "$CATALOG" "$uri") + if [[ $? -ne 0 ]]; then + result="" + next=$(( ${#ERRORS[@]} + 1 )) + ERRORS[next]="$uri" + fi + # Check if we have after the release a format + if [[ $uri =~ ((5\.[0-9])/([^/]+))(/)? ]]; then + # If we have a match, we have: + # ${BASH_REMATCH[0]} => the complete match + # ${BASH_REMATCH[1]} => DocBook version + Format, e.g "5.0/rng" + # ${BASH_REMATCH[2]} => DocBook version only + # ${BASH_REMATCH[3]} => Format only + DBFORMAT=${BASH_REMATCH[1]} + FORMAT=${BASH_REMATCH[3]} + FILES="${TO_CHECK[$DBFORMAT]}" + + # Remove "/" at end, if needed: + uri="${uri%/}" + # echo "To check $DBFORMAT: $FILES" + for file in $FILES; do + echo -en "Checking $uri/$file... =>" + next=$(( "$len" + 1 )) + result=$(resolveuri "$CATALOG" "${uri}/$file") + ret=$? + result="${BUILDROOT}${result#file://*}" + # We check the return value and _not_ the result string + if [[ $ret -ne 0 ]]; then + result="" + ERRORS[next]="$uri/$file" + echo -en " not resolvable\n" + elif [[ ! -e $result ]]; then + ERRORS[next]="$result" + echo -en " doesn't exist\n" + else + echo -en " ok\n" + fi + done + fi +done + +echo "-----------------------------" +# make them unique: +ERRORS=($(for err in "${ERRORS[@]}"; do echo "${err}"; done | sort -u)) +echo "Found ${#ERRORS[@]} errors". + +if [ ${#ERRORS[@]} -ne 0 ]; then + for elem in "${!ERRORS[@]}"; do + echo "${elem}: ${ERRORS[${elem}]}" + done + exit 100 +fi +exit 0 \ No newline at end of file diff --git a/docbook-5.0-docs.tar.bz2 b/docbook-5.0-docs.tar.bz2 new file mode 100644 index 0000000..7a1b4c7 --- /dev/null +++ b/docbook-5.0-docs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3787832336b8b3a1fb5cf752db5dcf380ab3e4d643ac4c27bec34ffe22cc235e +size 225280 diff --git a/docbook-5.0.tar.bz2 b/docbook-5.0.tar.bz2 new file mode 100644 index 0000000..1c8f959 --- /dev/null +++ b/docbook-5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ba17ed3279775b59d2e70d8a6a9b145e8450851f51b099d9c74e906027cd02e +size 661482 diff --git a/docbook-5.1-docs.tar.bz2 b/docbook-5.1-docs.tar.bz2 new file mode 100644 index 0000000..c84ae08 --- /dev/null +++ b/docbook-5.1-docs.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f34ddf51afadf742510c351ead7e3eec8a719b2daa8b75f2b6464dae44134d1 +size 491520 diff --git a/docbook-5.1.tar.bz2 b/docbook-5.1.tar.bz2 new file mode 100644 index 0000000..8485f57 --- /dev/null +++ b/docbook-5.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44d958dac417c72a296d651cff762b15dc3c6ea347ded6e9e006931d19375ab5 +size 842187 diff --git a/docbook-5.2CR5.zip b/docbook-5.2CR5.zip new file mode 100644 index 0000000..d294b79 --- /dev/null +++ b/docbook-5.2CR5.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de0a9a435b4be54b72943e5b2704befdd79a8265f3c92eb930f2c595f0cc422 +size 992258 diff --git a/docbook_5-README.SUSE b/docbook_5-README.SUSE new file mode 100644 index 0000000..fcc30d7 --- /dev/null +++ b/docbook_5-README.SUSE @@ -0,0 +1,78 @@ +README.SUSE (2023-02-09) +======================== + +XML Catalog File +---------------- + +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// +* http://www.docbook.org/xml// +* http://docbook.org/xml// +* https://cdn.docbook.org/schema// + +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 admonition element. +* New 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 ITS schemas. +* Allow as root element +* Many bug fixes + + +DocBook V5.1 +------------ + +DocBook is a general purpose schema particularly well suited to books and +papers about computer hardware and software (though it is by no means +limited to these applications). + +The Version 5.1 release introduces assemblies for topic-oriented authoring. +It also addresses a selection of bugs and feature requests. + +For further details, see the documentation in the package docbook_5-doc diff --git a/docbook_5-nvdl.patch b/docbook_5-nvdl.patch new file mode 100644 index 0000000..1849f78 --- /dev/null +++ b/docbook_5-nvdl.patch @@ -0,0 +1,35 @@ +From: Thomas Schraitle +Date: 2017-11-10 20:33:44 +0100 +Subject: change path to DocBook RNG/SCH schema files +References: n/a +Upstream: no + +openSUSE installs links in the nvdl/ folder so the path to the +DocBook schema files were necessary. + +--- docbook-5.0/docbook.nvdl.bak 2017-11-10 20:33:44.294076884 +0100 ++++ docbook-5.0/docbook.nvdl 2017-11-10 20:34:26.114496772 +0100 +@@ -4,8 +4,8 @@ + + + +- +- ++ ++ + + + +--- docbook-5.1/docbook.nvdl.bak 2017-11-10 20:38:32.596975700 +0100 ++++ docbook-5.1/docbook.nvdl 2017-11-10 20:38:47.445124748 +0100 +@@ -4,8 +4,8 @@ + + + +- +- ++ ++ + + + diff --git a/docbook_5.changes b/docbook_5.changes new file mode 100644 index 0000000..8e52d21 --- /dev/null +++ b/docbook_5.changes @@ -0,0 +1,301 @@ +------------------------------------------------------------------- +Fri Mar 3 06:54:34 UTC 2023 - Thomas Schraitle - 5.2CR5 + +Only spec file changes + +- Introduce check-catalog.sh script in %check section + This script tests the docbook_5.xml XML catalog, extracts entries, and checks + if the file exists. + +- Add missing "/" in catalog file "docbook_5.xml" + In several rewritePrefix attributes the missing "/" leads to invalid local paths. + For example: + + $ xmlcatalog /etc/xml/catalog https://cdn.docbook.org/schema/5.2/rng/assemblyxi.rnc + file:///usr/share/xml/docbook/schema/rng/5.2assemblyxi.rnc + + The ".../5.2assemblyxi.rnc" part should be ".../5.2/assemblyxi.rnc". + +------------------------------------------------------------------- +Thu Feb 9 12:39:46 UTC 2023 - Thomas Schraitle - 5.2CR5 + +- Update to version 5.2CR5 + fixes a bug where the cols attribute on entrytbl element was + incorrectly optional. + +------------------------------------------------------------------- +Thu Feb 9 12:39:46 UTC 2023 - Thomas Schraitle - 5.2CR4 + +- Update to version 5.2CR4 + - Fix OASIS identifiers in catalog, CR4 (#245) + - Allow info to be a top-level element in a document (#244) + - Fix XInclude declarations, inconsistencies (#243) + - Documentation updates (#242) + +------------------------------------------------------------------- +Thu Dec 8 13:36:14 UTC 2022 - Thomas Schraitle - 5.2CR3 + +- Update to version 5.2CR3 + - PR #237 Allow namespace qualified attributes in non-DB namespaces + - Add 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/ in the XML catalog file + docbook_5.xml + - Update docbook_5-README.SUSE + +------------------------------------------------------------------- +Mon May 30 09:16:33 UTC 2022 - Thomas Schraitle - 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 - 5.2b12 + +- Update to version 5.2b12: + - Fix #223 by refactoring namespacesynopsis as packagesynopis + - Fix #221 by setting the queryBinding on Schematron schemas to xslt2 + +- Update to version 5.2b11: + - Fix #212 Incorrect XML catalog generation for CDN URIs. + - Fix #216 A bug in the citetitle element; the otherpubwork attribute was missing + + +------------------------------------------------------------------- +Thu Jul 15 07:02:57 UTC 2021 - Thomas Schraitle - 5.2b10a5 + +- Update to version 5.2b10a5: + - Fixed the bug where db.extension.inlines and db.extension.blocks were + accidentally omitted from a4. + - Made the name attribute on meta optional. + - Fixed duplicate patterns in db.synopsis.blocks. + - Improved the consistency of synopsisinfo by making it available in + fieldsynopsis, constructorsynopsis, and destructorsynopsis. + +- Spec file + - Correct XML catalog entry and replaced wrong and old 5.210a2 + version with current version + - Remove %lastschemaversion variable, consolidate to %version + +------------------------------------------------------------------- +Thu Jul 9 08:15:00 UTC 2021 - Thomas Schraitle - 5.2b10a4 + +- Update to version 5.2b10a4: + - Adding transclusion attributes as common attributes (#187) + - Implementing legalsection as a class attribute (#186) + - Add a type attribute to formal and informal objects (#185) + - Add pubwork/otherpubwork to biblioentry/bibliomixed (#184) + - Add a DocBook ITS + XInclude schema (#183) + - Proposed fix for issues related to the new synopsis elements (#173) + - Convert @name on s:pattern to s:title in ISO Schematron (#2) + +- Update to version 5.2b10a3: + - Add a general meta element (#176) + - Fix XInclude issues on empty href, fragid (#175) + - Add Schematron rules for productionset and callout (#174, #151, #162) + +------------------------------------------------------------------- +Mon Aug 31 13:45:10 UTC 2020 - Thomas Schraitle - 5.2b10a2 + +- Spec improvements: + move creating of compatibility links (5.2b10a2 -> 5.2) from spec + file into Makefile + +------------------------------------------------------------------- +Thu Aug 6 12:51:10 UTC 2020 - mmuschner - 5.2b10a2 + +Update to version 5.2b10a2: + - Added a transform attribute to the resource element (as an alternative to grammar). + - Removed the grammar attribute from output. + - Added a danger admonition. + - Added a legalsection sectioning element. Allow legalsection in legalnotice. + - Added an otherclass attribute to article as an alternative to the enumerated class values. + - Added a formalgroup element to contain several formal objects (for example, subfigures in a figure). + - Relaxed the content model of abstract to include non-paragraph block elements. + - Added multimediaparams to imagedata. + - Added a buildtarget inline. + - Allow funcdef to contain an explicit void. + - Allow paramdef to contain modifiers. + - Allow fieldsynopsis, methodsynopsis, and methodparam to contain more than one type. + - Extended the content model of type so that it can represent union and intersection types. Added a class attribute to type. + - Allow numbered sections (sect1, sect2, etc.) to contain refentry. + - Added interface to the enumerated values in the class attribute of systemitem.- + - Fix XML catalog to allow both www.docbook.org and docbook.org as URIs. + +------------------------------------------------------------------- +Fri Dec 8 22:12:24 UTC 2017 - dimstar@opensuse.org + +- Fix fdupes macro invocation: the fdupes macro knows no -q + parameter. + +------------------------------------------------------------------- +Sun Nov 12 17:02:51 UTC 2017 - thomas.schraitle@suse.com + +- Correct Makefile: + - Add more pattern rules + - Use more builtin make functions + - Create links in nvdl directory to docbook.{rng,sch} + - Add missing assembly.rn{c,g} and dbits.rn{c,g} for Schematron + +- Correct spec file: + - Add docbook_5-nvdl.patch to change path to DocBook RNG/SCH files + - Apply spec-cleaner + +------------------------------------------------------------------- +Wed Oct 11 15:10:23 UTC 2017 - thomas.schraitle@suse.com + +- New version 5.1 + - no DTD and XSD schemas for version 5.1 anymore! + +- Changes in spec file: + - used spec-cleaner + - removed obsolete stuff + - install files through Makefile + - install NVDL files under /usr/share/xml/docbook/schema/nvdl + instead as "documentation" + + +------------------------------------------------------------------- +Fri Jun 17 12:00:51 UTC 2016 - fvogt@suse.com + +- Split documentation into -doc subpackage +- Use newer sgml-spec + +------------------------------------------------------------------- +Tue May 12 12:44:54 UTC 2015 - toms@opensuse.org + +- Changed DocBook catalog URIs to 5.1 instead of 5.1CR3 + +------------------------------------------------------------------- +Tue Feb 19 11:35:00 UTC 2015 - toms@opensuse.org + +- Fixed subtle XML catalog bug (bsc#918565) +- Added DocBook 5.1CR3 +- Spec file changes: + . Make post and postun sections work + . Lots of entries in XML catalogs need to be generated, so it's + easier to use for loops + +------------------------------------------------------------------- +Mon Mar 18 12:40:42 UTC 2013 - cfarrell@suse.com + +- license update: SUSE-Oasis-Specification-Notice + See any of the files in the docs/ subdirectory (section on notices and ip + towards the end) + +------------------------------------------------------------------- +Fri Mar 1 11:48:20 UTC 2013 - coolo@suse.com + +- update license to new format + +------------------------------------------------------------------- +Tue Jun 5 14:32:11 UTC 2012 - ke@suse.de + +- Reduce Requires (iso_ent and xmlcharent). + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile + (cf. packaging guidelines) + +------------------------------------------------------------------- +Mon Aug 3 10:57:28 CEST 2009 - aj@suse.de + +- Only remove file from catalog if it disappeared. + +- Do not use release numbers, they're not needed anymore. + +- Cleanup some rpmlint warnings: Non-executable-in-bin, duplicate + requires, do not remove buildroot. + +------------------------------------------------------------------- +Mon Feb 11 08:35:56 CET 2008 - toms@suse.de + +- Release of version 5.0 (Committee Draft) + There are no user-visible changes in 5.0 (Public Review Draft 1). + This version of DocBook V5.0 will become the official Committee + Specification version of DocBook V5.0 as soon as the + Technical Committee balloting process is finished. +- Added DocBook Specification in PDF, HTML and XML + + +------------------------------------------------------------------- +Thu May 24 10:38:42 CEST 2007 - toms@suse.de + +- Updated to release 5.0CR4: + * Fixed RFE 1708032: Pattern naming inconsistency; changed + db.href.attribute to db.href.attributes. + * Fixed RFE 1700154: Added sortas to . + * Fixed RFE 1686919: Added an NVDL rules file. + * Fixed RFE 1705596: Aded db.programming.inlines (, + , , , , + , , , , , + , , , and ) to the + content model of . + * Fixed RFE 1689228: Fixed typo in Schematron assertion. + +------------------------------------------------------------------- +Fri Mar 23 20:51:50 CET 2007 - toms@suse.de + +- Updated to release 5.0CR3: + * RFE 1679775: Changed semantics of . A is now + required (instead of a as in previous releases). This + allows the definition of one term to refer to another. + + * RFE 1682917: Added pgwide attribute to . + + * RFE 1644553: Added label attribute to CALS and HTML tables. + + * RFE 1588693: Added an element, peer to + , replacing which had only been available at the + end of
. + + * After several months of consideration and experimentation, we decided + to allow in HTML tables. + + * RFE 1673820: Adopted "http://docbook.org/xlink/role/olink" as an XLink + role (that is, the xlink:role attribute) value to identify OLinks + expressed using XLink attributes. + + +------------------------------------------------------------------- +Wed Mar 14 10:55:18 CET 2007 - toms@suse.de + +- Updated to release 5.0CR2: + * Fixed RFE 1630203: Allow empty glossary. + * Fixed RFE 1627845: Allow optional caption on CALS table and informaltable. + * Related to RFE 1627845: Allow inlines in HTML table caption. + * Fixed RFE 1589139 (and RFE 1621178): Allow title and titleabbrev on qandaentry. + * Fixed RFE 1675932: Restore localname, prefix and namespace as class attribute values on tag. + * Fixed RFE 1669465: Schematron rules should refer to @xml:id, not @id. + + +------------------------------------------------------------------- +Mon Feb 19 13:40:51 CET 2007 - toms@suse.de + +- First release of 5.0CR1 + diff --git a/docbook_5.spec b/docbook_5.spec new file mode 100644 index 0000000..1655b14 --- /dev/null +++ b/docbook_5.spec @@ -0,0 +1,171 @@ +# +# spec file for package docbook_5 +# +# Copyright (c) 2023 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define schemaversions 5.0 5.1 5.2CR5 +%define realversion 5.2CR5 +# +Name: docbook_5 +Version: 5.2cr5 +Release: 0 +Summary: DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x +License: SUSE-Oasis-Specification-Notice +Group: Productivity/Publishing/DocBook +URL: https://www.oasis-open.org/docbook/ +# XML Catalog Entry +Source1: %{name}.xml +Source2: %{name}-README.SUSE +# DocBook Sources +Source3: docbook-5.0-docs.tar.bz2 +Source4: docbook-5.1-docs.tar.bz2 +Source6: Makefile +# For testing +Source10: check-catalog.sh + +# DB 5.0 +Source500: docbook-5.0.tar.bz2 +# DB 5.1 +Source510: docbook-5.1.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 +BuildRequires: xmlstarlet +Requires: sgml-skel >= 0.7 +Requires(post): sgml-skel >= 0.7 +Requires(postun):sgml-skel >= 0.7 +BuildArch: noarch + +%description +DocBook is a schema. It is particularly well-suited to books and papers +about computer hardware and software (though it is not limited to these +applications at all). + +Version 5 is a complete rewrite of DocBook in RELAX NG. +The intent of this rewrite is to produce a schema that is true to the +spirit of DocBook while simultaneously removing inconsistencies that +have arisen as a natural consequence of DocBook's long, slow evolution. + +%package doc +Summary: Documentation for %{name} +Group: Documentation/HTML +BuildArch: noarch + +%description doc +The documentation for the DocBook 5.x specification (%{schemaversions}) + +%define xml_dir %{_datadir}/xml +%define xml_docbook_dir %{xml_dir}/docbook +%define xml_schema_dir %{xml_dir}/docbook/schema +%define xml_docbook_dtd_dir %{xml_schema_dir}/dtd +%define xml_docbook_rng_dir %{xml_schema_dir}/rng +%define xml_docbook_sch_dir %{xml_schema_dir}/sch +%define xml_docbook_xsd_dir %{xml_schema_dir}/xsd +%define xml_docbook_nvdl_dir %{xml_schema_dir}/nvdl +%define xml_docbook_custom_dir %{xml_docbook_dir}/custom +%define xml_docbook_style_dir %{xml_docbook_dir}/stylesheet +%define xml_config_dir %{_localstatedir}/lib/xml +%define xml_sysconf_dir %{_sysconfdir}/xml + +%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} +unzip %{SOURCE520} +# Unpack the documentation: +tar -xf %{SOURCE3} +tar -xf %{SOURCE4} + +chmod -R a+rX,g-w,o-w . +find . -type f | xargs chmod a-x + +# Patching +%patch501 + +%build +# Nothing to build + +%install +make DESTDIR=%{buildroot} + +# cleanup +%fdupes %{buildroot} + +%post +update-xml-catalog + +%postun +update-xml-catalog + +%check +%define catalog %{buildroot}%{xml_sysconf_dir}/catalog.d/docbook_5.xml +cp -p %{SOURCE10} . +chmod +x check-catalog.sh + +./check-catalog.sh --buildroot %{buildroot} "%{catalog}" + +%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} +%dir %{xml_docbook_rng_dir} +%dir %{xml_docbook_sch_dir} +%dir %{xml_docbook_xsd_dir} +%dir %{xml_docbook_nvdl_dir} +%dir %{xml_docbook_style_dir} +# 5.0 +%{xml_docbook_dtd_dir}/5.0 +%{xml_docbook_rng_dir}/5.0 +%{xml_docbook_sch_dir}/5.0 +%{xml_docbook_xsd_dir}/5.0 +%{xml_docbook_nvdl_dir}/5.0 +# 5.1 +%{xml_docbook_rng_dir}/5.1 +%{xml_docbook_sch_dir}/5.1 +%{xml_docbook_nvdl_dir}/5.1 +#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 +%{xml_docbook_nvdl_dir}/5.2 +# Upgrade stylesheet +%{xml_docbook_style_dir}/upgrade +# +%{_bindir}/db4-entities.pl + +%files doc +%doc docbook*spec-cd-01.{pdf,html,xml} +%doc docbook*-os.{pdf,html,xml} + +%changelog diff --git a/docbook_5.xml b/docbook_5.xml new file mode 100644 index 0000000..79f3fbf --- /dev/null +++ b/docbook_5.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +