use new sgml package to provide XML catalogs

docbook/docbook.spec

@@ -43,7 +43,7 @@ Distribution: OpenPKG [PLUS]
 Group:        SGML
 License:      BSD
 Version:      4.2
-Release:      20030604
+Release:      20030605
 
 #   list of sources
 Source0:      http://www.oasis-open.org/docbook/xml/%{V_dtd_xml}/docbook-xml-%{V_dtd_xml}.zip
@@ -176,7 +176,7 @@ AutoReqProv:  no
 
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
-        '%not %dir %{l_prefix}/share/sgml'
+        '%not %dir %attr(0644,-,-) %{l_prefix}/share/sgml'
 
 %files -f files
 
@@ -185,23 +185,88 @@ AutoReqProv:  no
 
 %post
     if [ $1 -eq 1 ]; then
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install iso8879-sgml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-xml-old
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-simple
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-dtd-sgml-old
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q install docbook-ss-dsssl
+        $RPM_INSTALL_PREFIX/bin/sgmlcatalog \
+            -p "ISO 8879:1986" \
+            -s "ISO 8879:1986//ENTITIES" \
+            -i iso8879-sgml \
+            -p "-//OASIS//DTD DocBook XML V4.1" \
+            -p "-//OASIS//ENTITIES DocBook XML V4.1" \
+            -S "http://www.oasis-open.org/docbook/xml/4.1" \
+            -U "http://www.oasis-open.org/docbook/xml/4.1" \
+            -x \
+            -i docbook-dtd-xml-old \
+            -p "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2" \
+            -p "-//OASIS//DTD DocBook XML V4.2" \
+            -p "-//OASIS//ENTITIES DocBook XML Character Entities V4.2" \
+            -p "-//OASIS//ENTITIES DocBook XML Notations V4.2" \
+            -p "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2" \
+            -p "-//OASIS//ENTITIES DocBook XML Document Hierarchy V4.2" \
+            -p "-//OASIS//DTD XML Exchange Table Model 19990315" \
+            -p "-//OASIS//DTD DocBook XML CALS Table Model V4.2" \
+            -p "-//OASIS//ENTITIES DocBook XML" \
+            -p "-//OASIS//DTD DocBook XML" \
+            -S "http://www.oasis-open.org/docbook/xml/4.2" \
+            -S "http://www.oasis-open.org/docbook/" \
+            -U "http://www.oasis-open.org/docbook/xml/4.2" \
+            -U "http://www.oasis-open.org/docbook/" \
+            -i docbook-dtd-xml \
+            -p "-//OASIS//DTD Simplified DocBook XML V1.0" \
+            -p "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0" \
+            -i docbook-dtd-simple \
+            -p "-//OASIS//DTD DocBook V4.1" \
+            -i docbook-dtd-sgml-old \
+            -p "-//OASIS//DTD DocBook V4.2" \
+            -p "-//OASIS//DTD DocBook XML V4.2" \
+            -i docbook-dtd-sgml \
+            -p "-//Norman Walsh//DOCUMENT DocBook " \
+            -p "-//Norman Walsh//DOCUMENT DSSSL " \
+            -p "-//Norman Walsh//DOCUMENT OLink " \
+            -p "+//IDN nwalsh.com//DTD DocBook" \
+            -p "-//Norman Walsh//DTD DocBook" \
+            -p "-//Norman Walsh//DTD Image Library" \
+            -i docbook-ss-dsssl \
+            -S "http://docbook.sourceforge.net/release/xsl/current" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.39" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.40" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.41" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.42" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.43" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.44" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.45" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.46" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.47" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.48" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.49" \
+            -S "http://docbook.sourceforge.net/release/xsl/1.50" \
+            -U "http://docbook.sourceforge.net/release/xsl/current" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.39" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.40" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.41" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.42" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.43" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.44" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.45" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.46" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.47" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.48" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.49" \
+            -U "http://docbook.sourceforge.net/release/xsl/1.50" \
+            -S "http://docbook.sourceforge.net/release/xsl/" \
+            -U "http://docbook.sourceforge.net/release/xsl/" \
+            -i docbook-ss-xsl
     fi
 
 %preun
     if [ $1 -eq 0 ]; then
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall iso8879-sgml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-xml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-xml-old
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-simple
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-sgml
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-dtd-sgml-old
-        $RPM_INSTALL_PREFIX/bin/mkcatalog -q deinstall docbook-ss-dsssl
+        $RPM_INSTALL_PREFIX/bin/sgmlcatalog \
+            -d iso8879-sgml \
+            -x \
+            -d docbook-dtd-xml-old \
+            -d docbook-dtd-xml \
+            -d docbook-dtd-simple \
+            -d docbook-dtd-sgml-old \
+            -d docbook-dtd-sgml \
+            -d docbook-ss-dsssl \
+            -d docbook-ss-xsl
     fi