restore compatibility symlinks in %share/xml/docbook/schema/ [release 1.0-2mamba;Thu Jun 10 2021]

This commit is contained in:
Silvan Calarco 2024-01-05 21:51:35 +01:00
parent 8e7fd58140
commit 3273f6ff8f
4 changed files with 602 additions and 377 deletions

View File

@ -0,0 +1,48 @@
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2009-02-19 13:49:08.000000000 +0100
+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-19 13:50:59.000000000 +0100
@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
-- ...................................................................... --
-- ISO entity sets ...................................................... --
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent"
-- End of catalog data for DocBook XML V4.1.2 ............................. --
-- ...................................................................... --

53
docbook-dtds-ents.patch Normal file
View File

@ -0,0 +1,53 @@
--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000
+++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2005-12-13 13:14:38.000000000 +0000
@@ -51,6 +51,7 @@
-- ...................................................................... --
-- ISO entity sets ...................................................... --
+--
PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
"iso-dia.gml"
@@ -109,5 +110,6 @@
PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
"iso-cyr2.gml"
+--
-- End of catalog data for DocBook V4.3 ................................. --
-- ...................................................................... --
--- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000
+++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2005-12-13 13:14:59.000000000 +0000
@@ -54,6 +54,7 @@
-- ...................................................................... --
-- ISO entity sets ...................................................... --
+--
PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
"iso-dia.gml"
@@ -112,5 +113,6 @@
PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
"iso-cyr2.gml"
+--
-- End of catalog data for DocBook V4.4 ................................. --
-- ...................................................................... --
diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100
+++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100
@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
-- ...................................................................... --
-- ISO entity sets ...................................................... --
+--
PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
"iso-dia.gml"
@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian
PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
"iso-cyr2.gml"
+--
+
-- End of catalog data for DocBook V4.5 ................................. --
-- ...................................................................... --

View File

@ -1,6 +1,10 @@
# Heavily based on Fedora package
%global openjadever 1.3.2
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: docbook-dtds Name: docbook-dtds
Version: 20080923 Epoch: 1
Release: 4mamba Version: 1.0
Release: 2mamba
Group: Applications/Publishing Group: Applications/Publishing
Summary: SGML and XML document type definitions for DocBook. Summary: SGML and XML document type definitions for DocBook.
License: Distributable License: Distributable
@ -8,17 +12,6 @@ URL: http://www.oasis-open.org/docbook/
Distribution: openmamba Distribution: openmamba
Vendor: openmamba Vendor: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it> Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
Provides: docbook-dtd-xml docbook-dtd-sgml
Provides: docbook-dtd30-sgml docbook-dtd31-sgml
Provides: docbook-dtd40-sgml docbook-dtd41-sgml
Provides: docbook-dtd412-xml
Provides: docbook-dtd42-sgml docbook-dtd42-xml
Provides: docbook-dtd43-sgml docbook-dtd43-xml
Provides: docbook-dtd44-sgml docbook-dtd44-xml
Provides: docbook-dtd45-sgml docbook-dtd45-xml
Provides: docbook-dtd50-sgml docbook-dtd50-xml
Requires(pre): libxml2-utils >= 2.6.17
Requires(pre): libxml2 >= 2.6.17
Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
@ -32,20 +25,46 @@ Source9: http://www.oasis-open.org/docbook/sgml/4.4/docbook-4.4.zip
Source10: http://www.oasis-open.org/docbook/xml/4.4/docbook-xml-4.4.zip Source10: http://www.oasis-open.org/docbook/xml/4.4/docbook-xml-4.4.zip
Source11: http://www.oasis-open.org/docbook/sgml/4.5/docbook-4.5.zip Source11: http://www.oasis-open.org/docbook/sgml/4.5/docbook-4.5.zip
Source12: http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip Source12: http://www.oasis-open.org/docbook/xml/4.5/docbook-xml-4.5.zip
#Source13: http://www.oasis-open.org/docbook/sgml/5.0/docbook-5.0.zip Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip
#Source14: http://www.oasis-open.org/docbook/xml/5.0/docbook-xml-5.0.zip Source14: http://www.docbook.org/rng/4.3/docbook-rng-4.3.zip
Source15: http://www.docbook.org/rng/4.4/docbook-rng-4.4.zip
#compressed from http://www.docbook.org/rng/4.5/ upstream archive unavailable
Source16: docbook-rng-4.5.zip
Source17: http://www.docbook.org/xsd/4.2/docbook-xsd-4.2.zip
Source18: http://www.docbook.org/xsd/4.3/docbook-xsd-4.3.zip
Source19: http://www.docbook.org/xsd/4.4/docbook-xsd-4.4.zip
#compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable
Source20: docbook-xsd-4.5.zip
Patch0: docbook-dtd30-sgml-1.0.catalog.patch Patch0: docbook-dtd30-sgml-1.0.catalog.patch
Patch1: docbook-dtd31-sgml-1.0.catalog.patch Patch1: docbook-dtd31-sgml-1.0.catalog.patch
Patch2: docbook-dtd40-sgml-1.0.catalog.patch Patch2: docbook-dtd40-sgml-1.0.catalog.patch
Patch3: docbook-dtd41-sgml-1.0.catalog.patch Patch3: docbook-dtd41-sgml-1.0.catalog.patch
Patch4: docbook-dtd42-sgml-1.0.catalog.patch Patch4: docbook-dtd42-sgml-1.0.catalog.patch
Patch5: docbook-4.2-euro.patch Patch5: docbook-4.2-euro.patch
#Fix ISO entities in 4.3/4.4/4.5 SGML
Patch6: docbook-dtds-ents.patch
#Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680)
Patch7: docbook-sgml-systemrewrite.patch
#use XML at the end of public identificators of XML 4.1.2 ISO entities
Patch8: docbook-dtd412-entities.patch
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: unzip >= 5.50 BuildRequires: unzip >= 5.50
BuildRoot: %{_tmppath}/%{name}-%{version} Obsoletes: docbook < 1:1.0
Obsoletes: docbook
Provides: docbook Provides: docbook
Provides: docbook-dtd-xml docbook-dtd-sgml
Provides: docbook-dtd30-sgml docbook-dtd31-sgml
Provides: docbook-dtd40-sgml docbook-dtd41-sgml
Provides: docbook-dtd412-xml
Provides: docbook-dtd42-sgml docbook-dtd42-xml
Provides: docbook-dtd43-sgml docbook-dtd43-xml
Provides: docbook-dtd44-sgml docbook-dtd44-xml
Provides: docbook-dtd45-sgml docbook-dtd45-xml
Provides: docbook-dtd50-sgml docbook-dtd50-xml
Requires(post): libxml2-utils >= 2.6.17
Requires(post): libxml2 >= 2.6.17
Requires: sgml-common
Requires: xml-common
BuildArch: noarch BuildArch: noarch
%description %description
@ -70,8 +89,6 @@ prep_docbook 4.1-sgml %{SOURCE3} %{PATCH3}
prep_docbook 4.1.2-xml %{SOURCE4} prep_docbook 4.1.2-xml %{SOURCE4}
prep_docbook 4.2-sgml %{SOURCE5} %{PATCH4} prep_docbook 4.2-sgml %{SOURCE5} %{PATCH4}
prep_docbook 4.2-xml %{SOURCE6} prep_docbook 4.2-xml %{SOURCE6}
# Fix € in SGML.
%patch5 -p1
prep_docbook 4.3-sgml %{SOURCE7} prep_docbook 4.3-sgml %{SOURCE7}
prep_docbook 4.3-xml %{SOURCE8} prep_docbook 4.3-xml %{SOURCE8}
@ -79,72 +96,92 @@ prep_docbook 4.4-sgml %{SOURCE9}
prep_docbook 4.4-xml %{SOURCE10} prep_docbook 4.4-xml %{SOURCE10}
prep_docbook 4.5-sgml %{SOURCE11} prep_docbook 4.5-sgml %{SOURCE11}
prep_docbook 4.5-xml %{SOURCE12} prep_docbook 4.5-xml %{SOURCE12}
#prep_docbook 5.0-sgml %{SOURCE13}
#prep_docbook 5.0-xml %{SOURCE14} # Docbook RNG
prep_docbook 4.2-rng %{SOURCE13}
prep_docbook 4.3-rng %{SOURCE14}
prep_docbook 4.4-rng %{SOURCE15}
prep_docbook 4.5-rng %{SOURCE16}
# Docbook XSD
prep_docbook 4.2-xsd %{SOURCE17}
prep_docbook 4.3-xsd %{SOURCE18}
prep_docbook 4.4-xsd %{SOURCE19}
prep_docbook 4.5-xsd %{SOURCE20}
# Fix € in SGML.
%patch5 -p1
# Fix ISO entities in 4.3/4.4/4.5 SGML
%patch6 -p1
# Rewrite SYSTEM to use local catalog instead web ones (#478680)
%patch7 -p1
# Add XML to the end of public identificators of 4.1.2 XML entities
%patch8 -p1
# Increase NAMELEN (bug #36058, bug #159382).
sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
# fix of \r\n issue from rpmlint
sed -i 's/\r//' */*.txt
%build %build
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
install -d -m0755 %{buildroot}%{_datadir}/xml/docbook/schema/dtd # Symlinks
mkdir -p %{buildroot}/etc/sgml
for fmt in sgml xml; do
ln -s $fmt-docbook-4.5.cat \
%{buildroot}/etc/sgml/$fmt-docbook.cat
done
function build_docbook() { for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml} 4.{2,3,4,5}-rng 4.{2,3,4,5}-xsd
cd $1-$2 do
DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$2-dtd-$1%{suffix} cd $dir
DESTDIR_XML=%{buildroot}%{_datadir}/xml/docbook/schema/dtd fmt=${dir#*-} ver=${dir%%-*}
case $fmt in
install -d $DESTDIR sgml) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
xml) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
# remove uninstalled .gml files rng) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-$ver ;;
if [ "$2" = "sgml" ]; then xsd) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-$ver ;;
sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat esac
fi case $fmt in
sgml) mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
install docbook.cat $DESTDIR/catalog xml) mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
install *.dtd $DESTDIR rng) mkdir -p $DESTDIR ; install *.r* $DESTDIR ;;
install *.mod $DESTDIR xsd) mkdir -p $DESTDIR ; install *.xsd $DESTDIR;;
case "$2" in
sgml)
install *.dcl $DESTDIR ;;
xml)
install -d $DESTDIR/ent
install ent/* $DESTDIR/ent ;;
esac esac
# Compatibility symlink
if [ "$2" = "xml" ]; then
ln -sf ../../../../sgml/docbook/xml-dtd-$1 %{buildroot}%{_datadir}/xml/docbook/schema/dtd/$1
fi
cd .. cd ..
} done
build_docbook 3.0 sgml for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}
build_docbook 3.1 sgml do
build_docbook 4.0 sgml cd $dir
build_docbook 4.1 sgml fmt=${dir#*-} ver=${dir%%-*}
build_docbook 4.1.2 xml DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver
build_docbook 4.2 sgml install *.dtd *.mod $DESTDIR
build_docbook 4.2 xml install docbook.cat $DESTDIR/catalog
build_docbook 4.3 sgml cd ..
build_docbook 4.3 xml # File for %%ghost
build_docbook 4.4 sgml touch %{buildroot}/etc/sgml/$fmt-docbook-$ver.cat
build_docbook 4.4 xml done
build_docbook 4.5 sgml
build_docbook 4.5 xml
#build_docbook 5.0 sgml
#build_docbook 5.0 xml
# symlinks # Compatibility symlinks
install -d %{buildroot}/etc/sgml install -d -m0755 %{buildroot}%{_datadir}/xml/docbook/schema/dtd
ln -s sgml-docbook-4.5%{suffix}.cat \ for dir in 4.1.2 4.{2,3,4,5}; do
%{buildroot}/etc/sgml/sgml-docbook.cat ln -s ../../../../sgml/docbook/xml-dtd-$dir %{buildroot}%{_datadir}/xml/docbook/schema/dtd/$dir
ln -s xml-docbook-4.5%{suffix}.cat \ done
%{buildroot}/etc/sgml/xml-docbook.cat
install -d %{buildroot}%{_datadir}/sgml/sgml-iso-entities-8879.1986 #workaround the missing support for --parents hack in rpm 4.11+
mkdir -p %{buildroot}%{_pkgdocdir}
for i in */*.txt */ChangeLog */README
do
cp -pr --parents $i %{buildroot}%{_pkgdocdir}
done
%clean %clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -153,322 +190,200 @@ install -d %{buildroot}%{_datadir}/sgml/sgml-iso-entities-8879.1986
%define __scriptlet_requires /bin/true %define __scriptlet_requires /bin/true
%post %post
if [ $1 -ge 1 ]; then catcmd='/usr/bin/xmlcatalog --noout'
#new install or upgrade xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
CATALOG=/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
[ -e $CATALOG ] ||
xmlcatalog --noout --create $CATALOG
# update the centralized catalog corresponding to this version of the DTD ## Clean up pre-docbook-dtds mess caused by broken trigger.
function update_catalog() { for v in 3.0 3.1 4.0 4.1 4.2
/usr/bin/xmlcatalog --sgml --noout \ do
--add /etc/sgml/$2-docbook-$1%{suffix}.cat \ if [ -f /etc/sgml/sgml-docbook-$v.cat ]
$CATALOG then
$catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \
/usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null
fi
done
/usr/bin/xmlcatalog --sgml --noout \ # The STYLESHEETS/catalog command is for the case in which the style sheets
--add /etc/sgml/$2-docbook-$1%{suffix}.cat \
/usr/share/sgml/docbook/$2-dtd-$1%{suffix}/catalog
}
update_catalog 3.0 sgml
update_catalog 3.1 sgml
update_catalog 4.0 sgml
update_catalog 4.1 sgml
update_catalog 4.1.2 xml
update_catalog 4.2 sgml
update_catalog 4.2 xml
update_catalog 4.3 sgml
update_catalog 4.3 xml
update_catalog 4.4 sgml
update_catalog 4.4 xml
update_catalog 4.5 sgml
update_catalog 4.5 xml
#update_catalog 5.0 sgml
#update_catalog 5.0 xml
# the following lines are for the case in which the style sheets
# were installed after another DTD but before this DTD # were installed after another DTD but before this DTD
STYLESHEETS=$(echo /usr/share/sgml/docbook/dsssl-stylesheets-*) for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done
STYLESHEETS=${STYLESHEETS##*/dsssl-stylesheets-} case $STYLESHEETS in
if [ "$STYLESHEETS" != "*" ]; then *-"*") STYLESHEETS= ;;
function update_catalog() { esac
#/usr/bin/xmlcatalog --sgml --noout \ for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}
# --add /etc/sgml/$2-docbook-$1%{suffix}.cat \ do
# /usr/share/sgml/openjade-%{openjadever}/catalog fmt=${dir#*-} ver=${dir%%-*}
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver
/usr/bin/xmlcatalog --sgml --noout \ ## SGML catalog
--add /etc/sgml/$2-docbook-$1%{suffix}.cat \ # Update the centralized catalog corresponding to this version of the DTD
/usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog for cat_dir in /usr/share/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
} $catcmd --sgml --add /etc/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog
done
update_catalog 3.0 sgml ## XML catalog
update_catalog 3.1 sgml if [ $fmt = xml -a -w $xmlcatalog ]; then
update_catalog 4.0 sgml while read f desc; do
update_catalog 4.1 sgml case $ver in 4.[45]) f=${f/-/} ;; esac
update_catalog 4.1.2 xml $catcmd --add public "$desc" $sgmldir/$f $xmlcatalog
update_catalog 4.2 sgml done <<ENDENT
update_catalog 4.2 xml ent/iso-pub.ent ISO 8879:1986//ENTITIES Publishing//EN
update_catalog 4.3 sgml ent/iso-grk1.ent ISO 8879:1986//ENTITIES Greek Letters//EN
update_catalog 4.3 xml dbpoolx.mod -//OASIS//ELEMENTS DocBook XML Information Pool V$ver//EN
update_catalog 4.4 sgml ent/iso-box.ent ISO 8879:1986//ENTITIES Box and Line Drawing//EN
update_catalog 4.4 xml docbookx.dtd -//OASIS//DTD DocBook XML V$ver//EN
update_catalog 4.5 xml ent/iso-grk3.ent ISO 8879:1986//ENTITIES Greek Symbols//EN
update_catalog 4.5 sgml ent/iso-amsn.ent ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN
# update_catalog 5.0 xml ent/iso-num.ent ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN
# update_catalog 5.0 sgml dbcentx.mod -//OASIS//ENTITIES DocBook XML Character Entities V$ver//EN
ent/iso-grk4.ent ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN
dbnotnx.mod -//OASIS//ENTITIES DocBook XML Notations V$ver//EN
ent/iso-dia.ent ISO 8879:1986//ENTITIES Diacritical Marks//EN
ent/iso-grk2.ent ISO 8879:1986//ENTITIES Monotoniko Greek//EN
dbgenent.mod -//OASIS//ENTITIES DocBook XML Additional General Entities V$ver//EN
dbhierx.mod -//OASIS//ELEMENTS DocBook XML Document Hierarchy V$ver//EN
ent/iso-amsa.ent ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN
ent/iso-amso.ent ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN
ent/iso-cyr1.ent ISO 8879:1986//ENTITIES Russian Cyrillic//EN
ent/iso-tech.ent ISO 8879:1986//ENTITIES General Technical//EN
ent/iso-amsc.ent ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN
soextblx.dtd -//OASIS//DTD XML Exchange Table Model 19990315//EN
calstblx.dtd -//OASIS//DTD DocBook XML CALS Table Model V$ver//EN
ent/iso-lat1.ent ISO 8879:1986//ENTITIES Added Latin 1//EN
ent/iso-amsb.ent ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN
ent/iso-lat2.ent ISO 8879:1986//ENTITIES Added Latin 2//EN
ent/iso-amsr.ent ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN
ent/iso-cyr2.ent ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN
ENDENT
for f in System URI; do
$catcmd --add rewrite$f "http://www.oasis-open.org/docbook/xml/$ver" \
$sgmldir $xmlcatalog
done
fi fi
done
# # Historic versions of this scriptlet contained the following comment:
# XML catalog # <quote>
# # Fix up SGML super catalog so that there isn't an XML DTD before an
CATALOG=/etc/xml/catalog # SGML one. We need to do this (*sigh*) because xmlcatalog messes up
#/usr/share/sgml/docbook/xmlcatalog # the order of the lines, and SGML tools don't like to see XML things
[ -e $CATALOG ] || # they aren't expecting.
xmlcatalog --noout --create $CATALOG # </quote>
# But the code that followed just found the first XML DTD and the first
function update_catalog() { # SGML DTD, swappinmg these two lines if the XML one preceded.
/usr/bin/xmlcatalog --noout --add "public" \ # But that only ensures that there is an SGML DTD before all XML ones.
"ISO 8879:1986//ENTITIES Publishing//EN" \ # No one complained, so either this was enough, or the buggy SGML tools
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-pub.ent" $CATALOG # are long dead, or their users do not use bugzilla.
/usr/bin/xmlcatalog --noout --add "public" \ # Anyway, the following code, introduced in 1.0-46, does better: it ensures
"ISO 8879:1986//ENTITIES Greek Letters//EN" \ # that all XML DTDs are after all SGML ones, by moving them to the end.
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-grk1.ent" $CATALOG sed -ni '
/usr/bin/xmlcatalog --noout --add "public" \ /xml-docbook/ H
"-//OASIS//ELEMENTS DocBook XML Information Pool V$1//EN" \ /xml-docbook/ !p
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/dbpoolx.mod" $CATALOG $ {
/usr/bin/xmlcatalog --noout --add "public" \ g
"ISO 8879:1986//ENTITIES Box and Line Drawing//EN" \ s/^\n//p
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-box.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/docbookx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Greek Symbols//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1-%{suffix}/ent/iso-grk3.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amsn.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-num.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Character Entities V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/dbcentx.mod" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-grk4.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Notations V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/dbnotnx.mod" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Diacritical Marks//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-dia.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Monotoniko Greek//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-grk2.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ENTITIES DocBook XML Additional General Entities V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/dbgenent.mod" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/dbhierx.mod" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amsa.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amso.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Russian Cyrillic//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-cyrl.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES General Technical//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-tech.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amsc.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/soextblx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"-//OASIS//DTD DocBook XML CALS Table Model V$1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/calstblx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Latin 1//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-lat1.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amsb.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Latin 2//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-lat2.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-amsr.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "public" \
"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}/ent/iso-cyr2.ent" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
"http://www.oasis-open.org/docbook/xml/$1" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}" $CATALOG
/usr/bin/xmlcatalog --noout --add "rewriteURI" \
"http://www.oasis-open.org/docbook/xml/$1" \
"/usr/share/sgml/docbook/xml-dtd-$1%{suffix}" $CATALOG
} }
' /etc/sgml/catalog
if [ -w $CATALOG ]; then
update_catalog 4.1.2
update_catalog 4.2
update_catalog 4.3
update_catalog 4.4
update_catalog 4.5
# update_catalog 5.0
fi
# Finally, make sure everything in /etc/sgml is readable! # Finally, make sure everything in /etc/sgml is readable!
/bin/chmod a+r /etc/sgml/* %{_bindir}/chmod a+r /etc/sgml/*
fi # new install or upgrade
exit 0
%postun %postun
if [ $1 -eq 0 ]; then # remove entries only on removal of package
#erase if [ "$1" = 0 ]; then
catcmd='/usr/bin/xmlcatalog --noout'
xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
entities="
ent/iso-pub.ent
ent/iso-grk1.ent
dbpoolx.mod
ent/iso-box.ent
docbookx.dtd
ent/iso-grk3.ent
ent/iso-amsn.ent
ent/iso-num.ent
dbcentx.mod
ent/iso-grk4.ent
dbnotnx.mod
ent/iso-dia.ent
ent/iso-grk2.ent
dbgenent.mod
dbhierx.mod
ent/iso-amsa.ent
ent/iso-amso.ent
ent/iso-cyr1.ent
ent/iso-tech.ent
ent/iso-amsc.ent
soextblx.dtd
calstblx.dtd
ent/iso-lat1.ent
ent/iso-amsb.ent
ent/iso-lat2.ent
ent/iso-amsr.ent
ent/iso-cyr2.ent
"
for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}
# do
# SGML catalog fmt=${dir#*-} ver=${dir%%-*}
# sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver
## SGML catalog
# Update the centralized catalog corresponding to this version of the DTD
$catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat >/dev/null
rm -f /etc/sgml/$fmt-docbook-$ver.cat
## XML catalog
if [ $fmt = xml -a -w $xmlcatalog ]; then
for f in $entities; do
case $ver in 4.[45]) f=${f/-/} ;; esac
$catcmd --del $sgmldir/$f $xmlcatalog >/dev/null
done
$catcmd --del $sgmldir $xmlcatalog >/dev/null
fi
done
# update the centralized catalog corresponding to this version of the DTD # See the comment attached to this command in the %%post scriptlet.
function update_catalog() { sed -ni '
/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$2-docbook-$1%{suffix}.cat \ /xml-docbook/ H
/etc/sgml/catalog 2>/dev/null /xml-docbook/ !p
rm -f /etc/sgml/$2-docbook-$1%{suffix}.cat $ {
g
s/^\n//p
} }
' /etc/sgml/catalog
update_catalog 3.0 sgml
update_catalog 3.1 sgml
update_catalog 4.0 sgml
update_catalog 4.1 sgml
update_catalog 4.1.2 xml
update_catalog 4.2 sgml
update_catalog 4.2 xml
update_catalog 4.3 sgml
update_catalog 4.3 xml
update_catalog 4.4 sgml
update_catalog 4.4 xml
update_catalog 4.5 sgml
update_catalog 4.5 xml
#update_catalog 5.0 sgml
#update_catalog 5.0 xml
#
# XML catalog
#
CATALOG=/usr/share/sgml/docbook/xmlcatalog
[ -e $CATALOG ] ||
xmlcatalog --noout --create $CATALOG
function update_catalog() {
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-pub.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-grk1.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/dbpoolx.mod" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-box.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/docbookx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-grk3.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amsn.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-num.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/dbcentx.mod" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-grk4.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/dbnotnx.mod" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-dia.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-grk2.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/dbgenent.mod" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/dbhierx.mod" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amsa.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amso.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-cyrl.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-tech.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amsc.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/soextblx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/calstblx.dtd" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-lat1.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amsb.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-lat2.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-amsr.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}/ent/iso-cyr2.ent" $CATALOG
/usr/bin/xmlcatalog --noout \
--del "xml-dtd-$1%{suffix}" $CATALOG
}
if [ -w $CATALOG ]; then
update_catalog 4.1.2
update_catalog 4.2
update_catalog 4.3
update_catalog 4.4
update_catalog 4.5
# update_catalog 5.0
fi fi
fi # erase %triggerin -- openjade >= %{openjadever}
exit 0 for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}
do
fmt=${dir#*-} ver=${dir%%-*}
/usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog
done
%triggerun -- openjade >= %{openjadever}
[ $2 = 0 ] || exit 0
for dir in {3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}
do
fmt=${dir#*-} ver=${dir%%-*}
/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog
done
%files %files
%defattr (-,root,root) %defattr (-,root,root)
%dir %{_datadir}/xml/docbook %config(noreplace) /etc/sgml/*ml-docbook.cat
%dir %{_datadir}/xml/docbook/schema %ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
%dir %{_datadir}/xml/docbook/schema/dtd %{_datadir}/sgml/docbook/*ml-dtd-*
%{_datadir}/sgml/docbook/rng-*
%{_datadir}/sgml/docbook/xsd-*
%{_datadir}/xml/docbook/schema/dtd/* %{_datadir}/xml/docbook/schema/dtd/*
%{_datadir}/sgml/docbook/sgml-dtd-3.0%{suffix} %{_pkgdocdir}
%{_datadir}/sgml/docbook/sgml-dtd-3.1%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.0%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.1%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.2%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.3%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.4%{suffix}
%{_datadir}/sgml/docbook/sgml-dtd-4.5%{suffix}
%{_datadir}/sgml/docbook/xml-dtd-4.1.2%{suffix}
%{_datadir}/sgml/docbook/xml-dtd-4.2%{suffix}
%{_datadir}/sgml/docbook/xml-dtd-4.3%{suffix}
%{_datadir}/sgml/docbook/xml-dtd-4.4%{suffix}
%{_datadir}/sgml/docbook/xml-dtd-4.5%{suffix}
#%{_datadir}/sgml/docbook/xml-dtd-5.0%{suffix}
%dir %{_datadir}/sgml/sgml-iso-entities-8879.1986
/etc/sgml/sgml-docbook.cat
/etc/sgml/xml-docbook.cat
#%doc --parents 3.1-sgml/ChangeLog
#%doc --parents 4.1-sgml/ChangeLog
#%doc --parents */*.txt
%changelog %changelog
* Thu Jun 10 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0-2mamba
- restore compatibility symlinks in %share/xml/docbook/schema/
* Wed Jun 02 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0-1mamba
- update to 1.0
* Thu Dec 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 20080923-4mamba * Thu Dec 03 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 20080923-4mamba
- remove missing .gml files from installed catalogs - remove missing .gml files from installed catalogs

View File

@ -0,0 +1,209 @@
diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100
@@ -30,6 +30,12 @@
DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
+++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100
@@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.1/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100
@@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
+++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100
@@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
+ "docbook.dtd"
+
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200
+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200
+++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100
@@ -17,6 +17,13 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
+ "docbook.dtd"
+
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200
+++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
+++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100
+++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200
+++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
--- docbook-dtds-1.0-orig/4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200
+++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100
@@ -17,6 +17,12 @@
--
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+ "docbookx.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"