rpms/docbook-dtds
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Refactor docbook-dtds specfile

Browse Source 
Use %%patch -P N instead of deprecated %%patchN
Use RPM macros in the spec file for paths
Add comments, improve the structure
Unify paths in patch files
Simplify install script
This commit is contained in:
Ondřej Sloup 2023-09-14 21:00:25 +02:00
parent fbf6c8a4c1
commit d4e9ed3474
10 changed files with 169 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docbook-4.2-euro.patch
View File

@ -1,5 +1,5 @@
--- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100 --- 4.2-sgml/docbookx.dtd.euro 2003-07-15 09:07:58.000000000 +0100
+++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100 +++ 4.2-sgml/docbookx.dtd 2003-07-15 09:08:12.000000000 +0100
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
<![%dbcent.module;[ <![%dbcent.module;[
@ -9,8 +9,8 @@
]]> ]]>
<![%xml.features;[ <![%xml.features;[
<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW --> <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
--- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100 --- 4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100
+++ docbook-dtds-1.0/4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100 +++ 4.2-xml/docbookx.dtd 2003-07-15 09:08:21.000000000 +0100
@@ -106,7 +106,7 @@ @@ -106,7 +106,7 @@
<![%dbcent.module;[ <![%dbcent.module;[

4
docbook-dtd30-sgml-1.0.catalog.patch
View File

@ -1,5 +1,5 @@
--- docbook.cat Tue Dec 10 16:35:22 1996 --- 3.0-sgml/docbook.cat Tue Dec 10 16:35:22 1996
+++ catalog Mon Jun 5 11:08:34 2000 +++ 3.0-sgml/catalog Mon Jun 5 11:08:34 2000
@@ -41,29 +41,6 @@ @@ -41,29 +41,6 @@
PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod" PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod" PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

4
docbook-dtd31-sgml-1.0.catalog.patch
View File

@ -1,5 +1,5 @@
--- docbook.cat Tue Feb 2 06:53:32 1999 --- 3.1-sgml/docbook.cat Tue Feb 2 06:53:32 1999
+++ catalog Thu May 25 11:45:01 2000 +++ 3.1-sgml/catalog Thu May 25 11:45:01 2000
@@ -35,29 +35,6 @@ @@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod" PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod" PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

4
docbook-dtd40-sgml-1.0.catalog.patch
View File

@ -1,5 +1,5 @@
--- docbook.cat Mon May 22 22:38:05 2000 --- 4.0-sgml/docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000 +++ 4.0-sgml/catalog Mon May 22 22:12:36 2000
@@ -35,29 +35,6 @@ @@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod" PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod" PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"

4
docbook-dtd41-sgml-1.0.catalog.patch
View File

@ -1,5 +1,5 @@
--- docbook.cat Mon May 22 22:38:05 2000 --- 4.1-sgml/docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000 +++ 4.1-sgml/catalog Mon May 22 22:12:36 2000
@@ -35,29 +35,6 @@ @@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod" PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod" PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"

4
docbook-dtd412-entities.patch
View File

@ -1,6 +1,6 @@
diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat 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 --- 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 +++ 4.1.2-xml/docbook.cat 2009-02-19 13:50:59.000000000 +0100
@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C @@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
-- ...................................................................... -- -- ...................................................................... --
-- ISO entity sets ...................................................... -- -- ISO entity sets ...................................................... --

4
docbook-dtd42-sgml-1.0.catalog.patch
View File

@ -1,5 +1,5 @@
--- docbook.cat.orig 2002-07-17 17:14:28.000000000 +0100 --- 4.2-sgml/docbook.cat.orig 2002-07-17 17:14:28.000000000 +0100
+++ docbook.cat 2002-07-17 21:58:24.000000000 +0100 +++ 4.2-sgml/docbook.cat 2002-07-17 21:58:24.000000000 +0100
@@ -49,65 +49,5 @@ @@ -49,65 +49,5 @@
PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
"dbcentx.mod" "dbcentx.mod"

12
docbook-dtds-ents.patch
View File

@ -1,5 +1,5 @@
--- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000 --- 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 +++ 4.3-sgml/docbook.cat 2005-12-13 13:14:38.000000000 +0000
@@ -51,6 +51,7 @@ @@ -51,6 +51,7 @@
-- ...................................................................... -- -- ...................................................................... --
@ -15,8 +15,8 @@
+-- +--
-- End of catalog data for DocBook V4.3 ................................. -- -- 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 --- 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 +++ 4.4-sgml/docbook.cat 2005-12-13 13:14:59.000000000 +0000
@@ -54,6 +54,7 @@ @@ -54,6 +54,7 @@
-- ...................................................................... -- -- ...................................................................... --
@ -32,9 +32,9 @@
+-- +--
-- End of catalog data for DocBook V4.4 ................................. -- -- 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 diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 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-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 +++ 4.5-sgml/docbook.cat 2009-02-19 13:47:31.000000000 +0100
@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara @@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
-- ...................................................................... -- -- ...................................................................... --

305
docbook-dtds.spec
View File

@ -5,7 +5,7 @@
Name: docbook-dtds Name: docbook-dtds
Version: 1.0 Version: 1.0
Release: 82%{?dist} Release: 83%{?dist}
Summary: SGML and XML document type definitions for DocBook Summary: SGML and XML document type definitions for DocBook
@ -33,14 +33,15 @@ Provides: docbook-dtd44-xml = %{version}-%{release}
Provides: docbook-dtd45-sgml = %{version}-%{release} Provides: docbook-dtd45-sgml = %{version}-%{release}
Provides: docbook-dtd45-xml = %{version}-%{release} Provides: docbook-dtd45-xml = %{version}-%{release}
Requires(post): /usr/bin/xmlcatalog Requires(post): %{_bindir}/xmlcatalog
Requires(postun): /usr/bin/xmlcatalog Requires(postun): %{_bindir}/xmlcatalog
Requires(post): %{_bindir}/chmod Requires(post): %{_bindir}/chmod
Requires(post): sed Requires(post): sed
Requires(postun): sed Requires(postun): sed
Requires: sgml-common Requires: sgml-common
Requires: xml-common Requires: xml-common
BuildRequires: unzip
BuildArch: noarch BuildArch: noarch
Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
@ -59,28 +60,28 @@ Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip
Source14: http://www.docbook.org/rng/4.3/docbook-rng-4.3.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 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 # Compressed from http://www.docbook.org/rng/4.5/ upstream archive unavailable
Source16: docbook-rng-4.5.zip Source16: docbook-rng-4.5.zip
Source17: http://www.docbook.org/xsd/4.2/docbook-xsd-4.2.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 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 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 # Compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable
Source20: docbook-xsd-4.5.zip Source20: docbook-xsd-4.5.zip
#fix old catalog files
# Fix old catalog files
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
#fix euro sign in 4.2 dtds # Fix euro sign in 4.2 dtds
Patch5: docbook-4.2-euro.patch Patch5: docbook-4.2-euro.patch
#Fix ISO entities in 4.3/4.4/4.5 SGML # Fix ISO entities in 4.3/4.4/4.5 SGML
Patch6: docbook-dtds-ents.patch Patch6: docbook-dtds-ents.patch
#Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680) # Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680)
Patch7: docbook-sgml-systemrewrite.patch Patch7: docbook-sgml-systemrewrite.patch
#use XML at the end of public identificators of XML 4.1.2 ISO entities # Use XML at the end of public identificators of XML 4.1.2 ISO entities
Patch8: docbook-dtd412-entities.patch Patch8: docbook-dtd412-entities.patch
BuildRequires: unzip
%description %description
The DocBook Document Type Definition (DTD) describes the syntax of The DocBook Document Type Definition (DTD) describes the syntax of
@ -92,138 +93,57 @@ This package contains SGML and XML versions of the DocBook DTD.
%prep %prep
%setup -c -T %setup -c -T
eval mkdir %{version_list} eval mkdir %{version_list}
# DocBook V3.0
cd 3.0-sgml
unzip %{SOURCE0}
%patch0 -p0 -b docbook.cat
cd ..
# DocBook V3.1 unzip %{SOURCE0} -d 3.0-sgml
cd 3.1-sgml unzip %{SOURCE1} -d 3.1-sgml
unzip %{SOURCE1} unzip %{SOURCE2} -d 4.0-sgml
%patch1 -p0 -b docbook.cat unzip %{SOURCE3} -d 4.1-sgml
cd .. unzip %{SOURCE4} -d 4.1.2-xml
unzip %{SOURCE5} -d 4.2-sgml
unzip %{SOURCE6} -d 4.2-xml
unzip %{SOURCE7} -d 4.3-sgml
unzip %{SOURCE8} -d 4.3-xml
unzip %{SOURCE9} -d 4.4-sgml
unzip %{SOURCE10} -d 4.4-xml
unzip %{SOURCE11} -d 4.5-sgml
unzip %{SOURCE12} -d 4.5-xml
unzip %{SOURCE13} -d 4.2-rng
unzip %{SOURCE14} -d 4.3-rng
unzip %{SOURCE15} -d 4.4-rng
unzip %{SOURCE16} -d 4.5-rng
unzip %{SOURCE17} -d 4.2-xsd
unzip %{SOURCE18} -d 4.3-xsd
unzip %{SOURCE19} -d 4.4-xsd
unzip %{SOURCE20} -d 4.5-xsd
# DocBook V4.0 %patch -P 0 -p0
cd 4.0-sgml %patch -P 1 -p0
unzip %{SOURCE2} %patch -P 2 -p0
%patch2 -p0 -b docbook.cat %patch -P 3 -p0
cd .. %patch -P 4 -p0
# DocBook V4.1
cd 4.1-sgml
unzip %{SOURCE3}
%patch3 -p0 -b docbook.cat
cd ..
# DocBook XML V4.1.2
cd 4.1.2-xml
unzip %{SOURCE4}
cd ..
# DocBook V4.2
cd 4.2-sgml
unzip %{SOURCE5}
%patch4 -p0 -b docbook.cat
cd ..
# DocBook XML V4.2
cd 4.2-xml
unzip %{SOURCE6}
cd ..
# DocBook V4.3
cd 4.3-sgml
unzip %{SOURCE7}
cd ..
# DocBook XML V4.3
cd 4.3-xml
unzip %{SOURCE8}
cd ..
# DocBook V4.4
cd 4.4-sgml
unzip %{SOURCE9}
cd ..
# DocBook XML V4.4
cd 4.4-xml
unzip %{SOURCE10}
cd ..
# DocBook v4.5
cd 4.5-sgml
unzip %{SOURCE11}
cd ..
# DocBook XML v4.5
cd 4.5-xml
unzip %{SOURCE12}
cd ..
# Docbook RNG v4.2
cd 4.2-rng
unzip %{SOURCE13}
cd ..
# Docbook RNG v4.3
cd 4.3-rng
unzip %{SOURCE14}
cd ..
# Docbook RNG v4.4
cd 4.4-rng
unzip %{SOURCE15}
cd ..
# Docbook RNG v4.5
cd 4.5-rng
unzip %{SOURCE16}
cd ..
# Docbook XSD v4.2
cd 4.2-xsd
unzip %{SOURCE17}
cd ..
# Docbook XSD v4.3
cd 4.3-xsd
unzip %{SOURCE18}
cd ..
# Docbook XSD v4.4
cd 4.4-xsd
unzip %{SOURCE19}
cd ..
# Docbook XSD v4.5
cd 4.5-xsd
unzip %{SOURCE20}
cd ..
# Fix &euro; in SGML. # Fix &euro; in SGML.
%patch5 -p1 %patch -P 5 -p0
# Fix ISO entities in 4.3/4.4/4.5 SGML # Fix ISO entities in 4.3/4.4/4.5 SGML
%patch6 -p1 %patch -P 6 -p0
# Rewrite SYSTEM to use local catalog instead web ones (#478680) # Rewrite SYSTEM to use local catalog instead web ones (#478680)
%patch7 -p1 %patch -P 7 -p0
# Add XML to the end of public identificators of 4.1.2 XML entities # Add XML to the end of public identificators of 4.1.2 XML entities
%patch8 -p1 %patch -P 8 -p0
# Increase NAMELEN (bug #36058, bug #159382). # Increase NAMELEN (bug #36058, bug #159382).
sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
# fix of \r\n issue from rpmlint # Fix of \r\n issue from rpmlint
sed -i 's/\r//' */*.txt sed -i 's/\r//' */*.txt
if [ `id -u` -eq 0 ]; then if [ `id -u` -eq 0 ]; then
chown -R root:root . %{_bindir}/chown -R root:root .
chmod -R a+rX,g-w,o-w . %{_bindir}/chmod -R a+rX,g-w,o-w .
fi fi
@ -231,81 +151,89 @@ fi
%install %install
# Symlinks # Creating a directory for SGML
mkdir -p $RPM_BUILD_ROOT/etc/sgml eval mkdir -p %{buildroot}/etc/sgml
# Loop through sgml and xml formats
for fmt in sgml xml; do for fmt in sgml xml; do
ln -s $fmt-docbook-4.5.cat \ # Creating symbolic links for docbook catalog files
$RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat ln -s $fmt-docbook-4.5.cat %{buildroot}/etc/sgml/$fmt-docbook.cat
done done
# Loop through different versions of docbook
eval set %{version_list} eval set %{version_list}
for dir for dir in $@; do
do pushd $dir
cd $dir fmt=${dir#*-} ver=${dir%%-*} # Formatting and versioning
fmt=${dir#*-} ver=${dir%%-*}
# Directory paths for different formats
case $fmt in case $fmt in
sgml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;; sgml|xml) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
xml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;; rng|xsd) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-$ver ;;
rng) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
xsd) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
esac esac
# Installing files to the corresponding directories
case $fmt in case $fmt in
sgml) mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;; sgml) mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
xml) mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;; xml) mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
rng) mkdir -p $DESTDIR ; install *.r* $DESTDIR ;; rng) mkdir -p $DESTDIR ; install *.r* $DESTDIR ;;
xsd) mkdir -p $DESTDIR ; install *.xsd $DESTDIR;; xsd) mkdir -p $DESTDIR ; install *.xsd $DESTDIR;;
esac esac
cd .. popd
done done
# Loop through different catalog versions
eval set %{catalog_list} eval set %{catalog_list}
for dir for dir in $@; do
do pushd $dir
cd $dir fmt=${dir#*-} ver=${dir%%-*} # Formatting and versioning
fmt=${dir#*-} ver=${dir%%-*} DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver
DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver
# Installing dtd and mod files, along with the catalog file
install *.dtd *.mod $DESTDIR install *.dtd *.mod $DESTDIR
install docbook.cat $DESTDIR/catalog install docbook.cat $DESTDIR/catalog
cd .. popd
# File for %%ghost
touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$ver.cat # Creating ghost file for each format-version pair
touch %{buildroot}/etc/sgml/$fmt-docbook-$ver.cat
done done
#workaround the missing support for --parents hack in rpm 4.11+ # Workaround for missing support for --parents in rpm 4.11+
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} mkdir -p %{buildroot}%{_pkgdocdir}
for i in */*.txt */ChangeLog */README
do # Copying text, ChangeLog, and README files to pkgdocdir with their parent directories
cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir} for i in */*.txt */ChangeLog */README; do
cp -pr --parents $i %{buildroot}%{_pkgdocdir}
done done
%files %files
#in upstream tarballs there is a lot of files with 0755 permissions # There is a lot of files with 0755 permissions in upstream tarballs,
#but they don't need to be, 0644 is enough for every file in tarball # but it is not needed. 0644 is enough for every file in tarball
%{_pkgdocdir} %doc %{_pkgdocdir}
/usr/share/sgml/docbook/*ml-dtd-* %{_datadir}/sgml/docbook/*ml-dtd-*
/usr/share/sgml/docbook/rng-* %{_datadir}/sgml/docbook/rng-*
/usr/share/sgml/docbook/xsd-* %{_datadir}/sgml/docbook/xsd-*
%config(noreplace) /etc/sgml/*ml-docbook.cat %config(noreplace) %{_sysconfdir}/sgml/*ml-docbook.cat
%ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat %ghost %config(noreplace) %{_sysconfdir}/sgml/*ml-docbook-*.cat
%post %post
catcmd='/usr/bin/xmlcatalog --noout' catcmd='/usr/bin/xmlcatalog --noout'
xmlcatalog=/usr/share/sgml/docbook/xmlcatalog xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog
## Clean up pre-docbook-dtds mess caused by broken trigger. # Clean up pre-docbook-dtds mess caused by broken trigger.
for v in 3.0 3.1 4.0 4.1 4.2 for v in 3.0 3.1 4.0 4.1 4.2 4.3 4.4 4.5
do do
if [ -f /etc/sgml/sgml-docbook-$v.cat ] if [ -f %{_sysconfdir}/sgml/sgml-docbook-$v.cat ]
then then
$catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \ $catcmd --sgml --del %{_sysconfdir}/sgml/sgml-docbook-$v.cat \
/usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null %{_datadir}/sgml/openjade-%{openjadever}/catalog 2>/dev/null
fi fi
done done
# The STYLESHEETS/catalog command is for the case in which the style sheets # The STYLESHEETS/catalog command is 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
for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done for STYLESHEETS in %{_datadir}/sgml/docbook/dsssl-stylesheets-*; do : ; done
case $STYLESHEETS in case $STYLESHEETS in
*-"*") STYLESHEETS= ;; *-"*") STYLESHEETS= ;;
esac esac
@ -313,13 +241,13 @@ eval set %{catalog_list}
for dir for dir
do do
fmt=${dir#*-} ver=${dir%%-*} fmt=${dir#*-} ver=${dir%%-*}
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
## SGML catalog # SGML catalog
# Update the centralized catalog corresponding to this version of the DTD # Update the centralized catalog corresponding to this version of the DTD
for cat_dir in /usr/share/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do for cat_dir in %{_datadir}/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
$catcmd --sgml --add /etc/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog $catcmd --sgml --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog
done done
## XML catalog # XML catalog
if [ $fmt = xml -a -w $xmlcatalog ]; then if [ $fmt = xml -a -w $xmlcatalog ]; then
while read f desc; do while read f desc; do
case $ver in 4.[45]) f=${f/-/} ;; esac case $ver in 4.[45]) f=${f/-/} ;; esac
@ -381,16 +309,16 @@ sed -ni '
g g
s/^\n//p s/^\n//p
} }
' /etc/sgml/catalog ' %{_sysconfdir}/sgml/catalog
# Finally, make sure everything in /etc/sgml is readable! # Finally, make sure everything in /etc/sgml is readable!
%{_bindir}/chmod a+r /etc/sgml/* %{_bindir}/chmod a+r %{_sysconfdir}/sgml/*
%postun %postun
# remove entries only on removal of package # Remove entries only on removal of package
if [ "$1" = 0 ]; then if [ "$1" = 0 ]; then
catcmd='/usr/bin/xmlcatalog --noout' catcmd='%{_bindir}/xmlcatalog --noout'
xmlcatalog=/usr/share/sgml/docbook/xmlcatalog xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog
entities=" entities="
ent/iso-pub.ent ent/iso-pub.ent
ent/iso-grk1.ent ent/iso-grk1.ent
@ -424,11 +352,11 @@ ent/iso-cyr2.ent
for dir for dir
do do
fmt=${dir#*-} ver=${dir%%-*} fmt=${dir#*-} ver=${dir%%-*}
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
## SGML catalog ## SGML catalog
# Update the centralized catalog corresponding to this version of the DTD # 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 $catcmd --sgml --del %{_sysconfdir}/sgml/catalog %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat >/dev/null
rm -f /etc/sgml/$fmt-docbook-$ver.cat rm -f %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat
## XML catalog ## XML catalog
if [ $fmt = xml -a -w $xmlcatalog ]; then if [ $fmt = xml -a -w $xmlcatalog ]; then
for f in $entities; do for f in $entities; do
@ -447,7 +375,7 @@ ent/iso-cyr2.ent
g g
s/^\n//p s/^\n//p
} }
' /etc/sgml/catalog ' %{_sysconfdir}/sgml/catalog
fi fi
%triggerin -- openjade >= %{openjadever} %triggerin -- openjade >= %{openjadever}
@ -455,8 +383,8 @@ eval set %{catalog_list}
for dir for dir
do do
fmt=${dir#*-} ver=${dir%%-*} fmt=${dir#*-} ver=${dir%%-*}
/usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$ver.cat \ %{_bindir}/xmlcatalog --sgml --noout --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog %{_datadir}/sgml/openjade-%{openjadever}/catalog
done done
%triggerun -- openjade >= %{openjadever} %triggerun -- openjade >= %{openjadever}
@ -465,11 +393,18 @@ eval set %{catalog_list}
for dir for dir
do do
fmt=${dir#*-} ver=${dir%%-*} fmt=${dir#*-} ver=${dir%%-*}
/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$ver.cat \ %{_bindir}/xmlcatalog --sgml --noout --del %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog %{_datadir}/sgml/openjade-%{openjadever}/catalog
done done
%changelog %changelog
* Thu Sep 14 2023 Ondrej Sloup <osloup@redhat.com> - 1.0-83
- Use %%patch -P N instead of deprecated %%patchN
- Use RPM macros in the spec file for paths
- Add comments, improve the structure
- Unify paths in patch files
- Simplify install script
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-82 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-82
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
@ -491,7 +426,7 @@ done
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-76 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-76
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Feb 05 2020 Ondrej Vasik <ovasik@redhat.com> - 1.0-75 * Wed Feb 05 2020 Ondrej Vasik <ovasik@redhat.com> - 1.0-75
- do not print an error when uninstalling and no other catalogs - do not print an error when uninstalling and no other catalogs
are present (#1357273) are present (#1357273)

52
docbook-sgml-systemrewrite.patch
View File

@ -1,5 +1,5 @@
diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat diff -urNp 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 --- 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 +++ docbook-dtds-1.0/3.0-sgml/docbook.cat 2009-02-05 16:48:58.000000000 +0100
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@
DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
@ -14,8 +14,8 @@ diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/3.1-sgml/docbook.cat 2009-02-05 16:56:51.000000000 +0100
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
@ -30,8 +30,8 @@ diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.0-sgml/docbook.cat 2009-02-05 16:49:06.000000000 +0100
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl" DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
@ -46,8 +46,8 @@ diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.1-sgml/docbook.cat 2009-02-05 16:49:27.000000000 +0100
@@ -22,6 +22,12 @@ @@ -22,6 +22,12 @@
DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
@ -62,8 +62,8 @@ diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.1.2-xml/docbook.cat 2009-02-05 16:52:16.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -78,8 +78,8 @@ diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xm
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.2-sgml/docbook.cat 2009-02-05 16:50:10.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -94,8 +94,8 @@ diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.2//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.2-xml/docbook.cat 2009-02-05 16:52:53.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -110,8 +110,8 @@ diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/do
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.3-sgml/docbook.cat 2009-02-05 16:50:37.000000000 +0100
@@ -17,6 +17,13 @@ @@ -17,6 +17,13 @@
-- --
@ -127,8 +127,8 @@ diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.3//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.3-xml/docbook.cat 2009-02-05 16:53:12.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -143,8 +143,8 @@ diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/do
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.4-sgml/docbook.cat 2009-02-05 16:50:57.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -159,8 +159,8 @@ diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.4//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.4-xml/docbook.cat 2009-02-05 16:53:30.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -175,8 +175,8 @@ diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/do
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.5-sgml/docbook.cat 2009-02-05 16:51:22.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --
@ -191,8 +191,8 @@ diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/
-- DocBook driver file .................................................. -- -- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.5//EN" 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 diff -urNp 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 --- 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 +++ docbook-dtds-1.0/4.5-xml/docbook.cat 2009-02-05 16:55:45.000000000 +0100
@@ -17,6 +17,12 @@ @@ -17,6 +17,12 @@
-- --