Compare commits

..

No commits in common. "c10" and "c8s" have entirely different histories.
c10 ... c8s

12 changed files with 332 additions and 258 deletions

63
.gitignore vendored
View File

@ -1,21 +1,42 @@
docbk30.zip
docbk31.zip
docbk40.zip
docbk41.zip
docbkx412.zip
docbook-4.2.zip
docbook-4.3.zip
docbook-4.4.zip
docbook-4.5.zip
docbook-rng-4.2.zip
docbook-rng-4.3.zip
docbook-rng-4.4.zip
docbook-rng-4.5.zip
docbook-xml-4.2.zip
docbook-xml-4.3.zip
docbook-xml-4.4.zip
docbook-xml-4.5.zip
docbook-xsd-4.2.zip
docbook-xsd-4.3.zip
docbook-xsd-4.4.zip
docbook-xsd-4.5.zip
SOURCES/docbk30.zip
SOURCES/docbk31.zip
SOURCES/docbk40.zip
SOURCES/docbk41.zip
SOURCES/docbkx412.zip
SOURCES/docbook-4.2.zip
SOURCES/docbook-4.3.zip
SOURCES/docbook-4.4.zip
SOURCES/docbook-4.5.zip
SOURCES/docbook-rng-4.2.zip
SOURCES/docbook-rng-4.3.zip
SOURCES/docbook-rng-4.4.zip
SOURCES/docbook-rng-4.5.zip
SOURCES/docbook-xml-4.2.zip
SOURCES/docbook-xml-4.3.zip
SOURCES/docbook-xml-4.4.zip
SOURCES/docbook-xml-4.5.zip
SOURCES/docbook-xsd-4.2.zip
SOURCES/docbook-xsd-4.3.zip
SOURCES/docbook-xsd-4.4.zip
SOURCES/docbook-xsd-4.5.zip
/docbk30.zip
/docbk31.zip
/docbk40.zip
/docbk41.zip
/docbkx412.zip
/docbook-4.2.zip
/docbook-4.3.zip
/docbook-4.4.zip
/docbook-4.5.zip
/docbook-rng-4.2.zip
/docbook-rng-4.3.zip
/docbook-rng-4.4.zip
/docbook-rng-4.5.zip
/docbook-xml-4.2.zip
/docbook-xml-4.3.zip
/docbook-xml-4.4.zip
/docbook-xml-4.5.zip
/docbook-xsd-4.2.zip
/docbook-xsd-4.3.zip
/docbook-xsd-4.4.zip
/docbook-xsd-4.5.zip

View File

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

View File

@ -1,5 +1,14 @@
--- 3.0-sgml/docbook.cat Tue Dec 10 16:35:22 1996
+++ 3.0-sgml/catalog Mon Jun 5 11:08:34 2000
--- docbook.cat Tue Dec 10 16:35:22 1996
+++ catalog Mon Jun 5 11:08:34 2000
@@ -27,7 +27,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -41,29 +41,6 @@
PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

View File

@ -1,5 +1,14 @@
--- 3.1-sgml/docbook.cat Tue Feb 2 06:53:32 1999
+++ 3.1-sgml/catalog Thu May 25 11:45:01 2000
--- docbook.cat Tue Feb 2 06:53:32 1999
+++ catalog Thu May 25 11:45:01 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

View File

@ -1,5 +1,14 @@
--- 4.0-sgml/docbook.cat Mon May 22 22:38:05 2000
+++ 4.0-sgml/catalog Mon May 22 22:12:36 2000
--- docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"

View File

@ -1,5 +1,14 @@
--- 4.1-sgml/docbook.cat Mon May 22 22:38:05 2000
+++ 4.1-sgml/catalog Mon May 22 22:12:36 2000
--- docbook.cat Mon May 22 22:38:05 2000
+++ catalog Mon May 22 22:12:36 2000
@@ -19,7 +19,7 @@
-- ...................................................................... --
-- SGML declaration associated with DocBook ............................. --
-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
+SGMLDECL "docbook.dcl"
-- ...................................................................... --
-- DocBook driver file .................................................. --
@@ -35,29 +35,6 @@
PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"

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
--- 4.1.2-xml/docbook.cat 2009-02-19 13:49:08.000000000 +0100
+++ 4.1.2-xml/docbook.cat 2009-02-19 13:50:59.000000000 +0100
--- 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 ...................................................... --

View File

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

View File

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

View File

@ -5,11 +5,12 @@
Name: docbook-dtds
Version: 1.0
Release: 90%{?dist}
Release: 69%{?dist}
Group: Applications/Text
Summary: SGML and XML document type definitions for DocBook
License: LicenseRef-docbook-dtds
License: Copyright only
URL: http://www.oasis-open.org/docbook/
Obsoletes: docbook-dtd30-sgml < %{version}-%{release}
@ -33,15 +34,15 @@ Provides: docbook-dtd44-xml = %{version}-%{release}
Provides: docbook-dtd45-sgml = %{version}-%{release}
Provides: docbook-dtd45-xml = %{version}-%{release}
Requires(post): %{_bindir}/xmlcatalog
Requires(postun): %{_bindir}/xmlcatalog
Requires(post): /usr/bin/xmlcatalog
Requires(postun): /usr/bin/xmlcatalog
Requires(post): %{_bindir}/chmod
Requires(post): sed
Requires(postun): sed
Requires: sgml-common
Requires: xml-common
BuildRequires: unzip
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch
Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
@ -60,28 +61,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
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
#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
#compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable
Source20: docbook-xsd-4.5.zip
# Fix old catalog files
#fix old catalog files
Patch0: docbook-dtd30-sgml-1.0.catalog.patch
Patch1: docbook-dtd31-sgml-1.0.catalog.patch
Patch2: docbook-dtd40-sgml-1.0.catalog.patch
Patch3: docbook-dtd41-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
# 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
# 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
# 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
BuildRequires: unzip
%description
The DocBook Document Type Definition (DTD) describes the syntax of
@ -93,57 +94,138 @@ This package contains SGML and XML versions of the DocBook DTD.
%prep
%setup -c -T
eval mkdir %{version_list}
# DocBook V3.0
cd 3.0-sgml
unzip %{SOURCE0}
%patch0 -p0 -b docbook.cat
cd ..
unzip %{SOURCE0} -d 3.0-sgml
unzip %{SOURCE1} -d 3.1-sgml
unzip %{SOURCE2} -d 4.0-sgml
unzip %{SOURCE3} -d 4.1-sgml
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 V3.1
cd 3.1-sgml
unzip %{SOURCE1}
%patch1 -p0 -b docbook.cat
cd ..
%patch -P 0 -p0
%patch -P 1 -p0
%patch -P 2 -p0
%patch -P 3 -p0
%patch -P 4 -p0
# DocBook V4.0
cd 4.0-sgml
unzip %{SOURCE2}
%patch2 -p0 -b docbook.cat
cd ..
# 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.
%patch -P 5 -p0
%patch5 -p1
# Fix ISO entities in 4.3/4.4/4.5 SGML
%patch -P 6 -p0
%patch6 -p1
# Rewrite SYSTEM to use local catalog instead web ones (#478680)
%patch -P 7 -p0
%patch7 -p1
# Add XML to the end of public identificators of 4.1.2 XML entities
%patch -P 8 -p0
%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
# fix of \r\n issue from rpmlint
sed -i 's/\r//' */*.txt
if [ `id -u` -eq 0 ]; then
%{_bindir}/chown -R root:root .
%{_bindir}/chmod -R a+rX,g-w,o-w .
chown -R root:root .
chmod -R a+rX,g-w,o-w .
fi
@ -151,89 +233,87 @@ fi
%install
# Creating a directory for SGML
eval mkdir -p %{buildroot}/etc/sgml
rm -rf $RPM_BUILD_ROOT
# Loop through sgml and xml formats
# Symlinks
mkdir -p $RPM_BUILD_ROOT/etc/sgml
for fmt in sgml xml; do
# Creating symbolic links for docbook catalog files
ln -s $fmt-docbook-4.5.cat %{buildroot}/etc/sgml/$fmt-docbook.cat
ln -s $fmt-docbook-4.5.cat \
$RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat
done
# Loop through different versions of docbook
eval set %{version_list}
for dir in $@; do
pushd $dir
fmt=${dir#*-} ver=${dir%%-*} # Formatting and versioning
# Directory paths for different formats
for dir
do
cd $dir
fmt=${dir#*-} ver=${dir%%-*}
case $fmt in
sgml|xml) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
rng|xsd) DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-$ver ;;
sgml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
xml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;;
rng) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
xsd) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;;
esac
# Installing files to the corresponding directories
case $fmt in
sgml) mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;;
xml) mkdir -p $DESTDIR/ent ; install ent/* $DESTDIR/ent ;;
rng) mkdir -p $DESTDIR ; install *.r* $DESTDIR ;;
xsd) mkdir -p $DESTDIR ; install *.xsd $DESTDIR;;
esac
popd
cd ..
done
# Loop through different catalog versions
eval set %{catalog_list}
for dir in $@; do
pushd $dir
fmt=${dir#*-} ver=${dir%%-*} # Formatting and versioning
DESTDIR=%{buildroot}/usr/share/sgml/docbook/$fmt-dtd-$ver
# Installing dtd and mod files, along with the catalog file
for dir
do
cd $dir
fmt=${dir#*-} ver=${dir%%-*}
DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver
install *.dtd *.mod $DESTDIR
install docbook.cat $DESTDIR/catalog
popd
# Creating ghost file for each format-version pair
touch %{buildroot}/etc/sgml/$fmt-docbook-$ver.cat
cd ..
# File for %%ghost
touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$ver.cat
done
# Workaround for missing support for --parents in rpm 4.11+
mkdir -p %{buildroot}%{_pkgdocdir}
# Copying text, ChangeLog, and README files to pkgdocdir with their parent directories
for i in */*.txt */ChangeLog */README; do
cp -pr --parents $i %{buildroot}%{_pkgdocdir}
#workaround the missing support for --parents hack in rpm 4.11+
mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir}
for i in */*.txt */ChangeLog */README
do
cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir}
done
%clean
rm -rf $RPM_BUILD_ROOT
%files
# There is a lot of files with 0755 permissions in upstream tarballs,
# but it is not needed. 0644 is enough for every file in tarball
%doc %{_pkgdocdir}
%{_datadir}/sgml/docbook/*ml-dtd-*
%{_datadir}/sgml/docbook/rng-*
%{_datadir}/sgml/docbook/xsd-*
%config(noreplace) %{_sysconfdir}/sgml/*ml-docbook.cat
%ghost %config(noreplace) %{_sysconfdir}/sgml/*ml-docbook-*.cat
%defattr (0644,root,root,0755)
#in upstream tarballs there is a lot of files with 0755 permissions
#but they don't need to be, 0644 is enough for every file in tarball
%{_pkgdocdir}
/usr/share/sgml/docbook/*ml-dtd-*
/usr/share/sgml/docbook/rng-*
/usr/share/sgml/docbook/xsd-*
%config(noreplace) /etc/sgml/*ml-docbook.cat
%ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat
%post
catcmd='/usr/bin/xmlcatalog --noout'
xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog
xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
# Clean up pre-docbook-dtds mess caused by broken trigger.
for v in 3.0 3.1 4.0 4.1 4.2 4.3 4.4 4.5
## Clean up pre-docbook-dtds mess caused by broken trigger.
for v in 3.0 3.1 4.0 4.1 4.2
do
if [ -f %{_sysconfdir}/sgml/sgml-docbook-$v.cat ]
if [ -f /etc/sgml/sgml-docbook-$v.cat ]
then
$catcmd --sgml --del %{_sysconfdir}/sgml/sgml-docbook-$v.cat \
%{_datadir}/sgml/openjade-%{openjadever}/catalog 2>/dev/null
$catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \
/usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null
fi
done
# The STYLESHEETS/catalog command is for the case in which the style sheets
# were installed after another DTD but before this DTD
for STYLESHEETS in %{_datadir}/sgml/docbook/dsssl-stylesheets-*; do : ; done
for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done
case $STYLESHEETS in
*-"*") STYLESHEETS= ;;
esac
@ -241,13 +321,13 @@ eval set %{catalog_list}
for dir
do
fmt=${dir#*-} ver=${dir%%-*}
sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
# SGML catalog
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver
## SGML catalog
# Update the centralized catalog corresponding to this version of the DTD
for cat_dir in %{_datadir}/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do
$catcmd --sgml --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat $cat_dir/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
# XML catalog
## XML catalog
if [ $fmt = xml -a -w $xmlcatalog ]; then
while read f desc; do
case $ver in 4.[45]) f=${f/-/} ;; esac
@ -309,16 +389,16 @@ sed -ni '
g
s/^\n//p
}
' %{_sysconfdir}/sgml/catalog
' /etc/sgml/catalog
# Finally, make sure everything in /etc/sgml is readable!
%{_bindir}/chmod a+r %{_sysconfdir}/sgml/*
%{_bindir}/chmod a+r /etc/sgml/*
%postun
# Remove entries only on removal of package
# remove entries only on removal of package
if [ "$1" = 0 ]; then
catcmd='%{_bindir}/xmlcatalog --noout'
xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog
catcmd='/usr/bin/xmlcatalog --noout'
xmlcatalog=/usr/share/sgml/docbook/xmlcatalog
entities="
ent/iso-pub.ent
ent/iso-grk1.ent
@ -352,18 +432,18 @@ ent/iso-cyr2.ent
for dir
do
fmt=${dir#*-} ver=${dir%%-*}
sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver
sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver
## SGML catalog
# Update the centralized catalog corresponding to this version of the DTD
$catcmd --sgml --del %{_sysconfdir}/sgml/catalog %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat >/dev/null
rm -f %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat
$catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat
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
$catcmd --del $sgmldir/$f $xmlcatalog
done
$catcmd --del $sgmldir $xmlcatalog >/dev/null
$catcmd --del $sgmldir $xmlcatalog
fi
done
@ -375,7 +455,7 @@ ent/iso-cyr2.ent
g
s/^\n//p
}
' %{_sysconfdir}/sgml/catalog
' /etc/sgml/catalog
fi
%triggerin -- openjade >= %{openjadever}
@ -383,8 +463,8 @@ eval set %{catalog_list}
for dir
do
fmt=${dir#*-} ver=${dir%%-*}
%{_bindir}/xmlcatalog --sgml --noout --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \
%{_datadir}/sgml/openjade-%{openjadever}/catalog
/usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog
done
%triggerun -- openjade >= %{openjadever}
@ -393,81 +473,11 @@ eval set %{catalog_list}
for dir
do
fmt=${dir#*-} ver=${dir%%-*}
%{_bindir}/xmlcatalog --sgml --noout --del %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \
%{_datadir}/sgml/openjade-%{openjadever}/catalog
/usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$ver.cat \
/usr/share/sgml/openjade-%{openjadever}/catalog
done
%changelog
* Thu Mar 27 2025 Michal Srb <michal@redhat.com> - 1.0-90
- Rebuild for Konflux (Resolves: RHEL-84822)
* Mon Feb 17 2025 Tomas Kopecek <tkopecek@redhat.com> - 1.0-89
- Rebuild for Konflux
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.0-88
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Jul 02 2024 Ondrej Sloup <osloup@redhat.com> - 1.0-87
- Update license tag to the SPDX format (LicenseRef-docbook-dtds)
- Resolves: RHEL-45839
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.0-86
- Bump release for June 2024 mass rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-85
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-84
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* 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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-81
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-80
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-79
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-78
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-77
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-76
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Feb 05 2020 Ondrej Vasik <ovasik@redhat.com> - 1.0-75
- do not print an error when uninstalling and no other catalogs
are present (#1357273)
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-74
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-73
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-72
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-71
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 11 2018 Ondrej Vasik <ovasik@redhat.com> - 1.0.70
- drop replacement of DTDDECL statements for old sgml catalogs (#1489451)
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-69
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

View File

@ -1,8 +1,8 @@
diff -urNp 3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
--- 3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
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"
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
@ -14,27 +14,27 @@ diff -urNp 3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
diff -urNp 3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
--- 3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
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"
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
+
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.1/docbook.dtd"
+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
+ "docbook.dtd"
+
+ -- ...................................................................... --
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
diff -urNp 4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
--- 4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
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"
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
@ -46,11 +46,12 @@ diff -urNp 4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
diff -urNp 4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
--- 4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
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"
SGMLDECL "docbook.dcl"
-- ...................................................................... --
+ -- SYSTEM rewrite of web URL .............. ............................. --
@ -62,8 +63,8 @@ diff -urNp 4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
diff -urNp 4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
--- 4.1.2-xml/docbook.cat 2000-08-27 17:19:42.000000000 +0200
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 @@
--
@ -78,8 +79,8 @@ diff -urNp 4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
diff -urNp 4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
--- 4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100
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 @@
--
@ -94,8 +95,8 @@ diff -urNp 4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
diff -urNp 4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
--- 4.2-xml/docbook.cat 2002-07-17 18:14:41.000000000 +0200
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 @@
--
@ -110,8 +111,8 @@ diff -urNp 4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
diff -urNp 4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
--- 4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
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 @@
--
@ -127,8 +128,8 @@ diff -urNp 4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
diff -urNp 4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
--- 4.3-xml/docbook.cat 2004-03-31 13:22:18.000000000 +0200
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 @@
--
@ -143,8 +144,8 @@ diff -urNp 4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
diff -urNp 4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
--- 4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
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 @@
--
@ -159,8 +160,8 @@ diff -urNp 4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
diff -urNp 4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
--- 4.4-xml/docbook.cat 2005-01-27 14:57:19.000000000 +0100
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 @@
--
@ -175,8 +176,8 @@ diff -urNp 4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
diff -urNp 4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
--- 4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200
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 @@
--
@ -191,8 +192,8 @@ diff -urNp 4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
-- DocBook driver file .................................................. --
PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
diff -urNp 4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
--- 4.5-xml/docbook.cat 2006-10-03 15:26:00.000000000 +0200
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 @@
--

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}