- use sgml macros

- rel. 9

Changed files:
    docbook-dtd412-xml.spec -> 1.16

diff --git a/docbook-dtd412-xml.spec b/docbook-dtd412-xml.spec
index aacb8d806330cb54cf10aa21a8ee7656fc3a7e22..f5699cab4729336e1662123e5b3e6311586615eb 100644 (file)
--- a/docbook-dtd412-xml.spec
+++ b/docbook-dtd412-xml.spec
@@ -6,7 +6,7 @@ Summary(pl):    XML/SGML DocBook DTD 4.1.2
 %define sver   412
 Name:          docbook-dtd%{sver}-xml
 Version:       1.0
-Release:       8
+Release:       9
 Vendor:                OASIS
 License:       Free
 Group:         Applications/Publishing/XML
@@ -21,7 +21,9 @@ Requires:     libxml2-progs >= 2.4.17-6
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                dtdpath         %{_datadir}/sgml/docbook/xml-dtd-%{ver}
+%define        dtdpath                 %{_datadir}/sgml/docbook/xml-dtd-%{ver}
+%define        xmlcat_file             %{dtd_path}/catalog.xml
+%define        sgmlcat_file    %{dtd_path}/catalog
 
 %description
 DocBook is an XML/SGML vocabulary particularly well suited to books
@@ -45,45 +47,38 @@ install -d $RPM_BUILD_ROOT%{dtdpath}
 install *.{dtd,mod} $RPM_BUILD_ROOT%{dtdpath}
 cp -a ent $RPM_BUILD_ROOT%{dtdpath}
 
-# associate default declaration for xml
-# and map system identifier for xml because opensp seems to misinterpret
-# xml-style system identifiers (file://...)
-cat <<EOF >>$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xml-dtd-%{ver}/catalog
-OVERRIDE YES
-  -- default decl --
-SGMLDECL "../../xml.dcl"
-  -- hacks for opensp --
-SYSTEM "file://%{_datadir}/sgml/docbook/xml-dtd-%{ver}/docbookx.dtd" "%{_datadir}/sgml/docbook/xml-dtd-%{ver}/docbookx.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/%{ver}/docbookx.dtd"                  "%{_datadir}/sgml/docbook/xml-dtd-%{ver}/docbookx.dtd"
+%sgmcat_fix >>$RPM_BUILD_ROOT%{sgmlcat_file}
 
-EOF
+grep -v 'ISO ' docbook.cat >> $RPM_BUILD_ROOT%{sgmlcat_file}
 
-grep -v 'ISO ' docbook.cat >> $RPM_BUILD_ROOT%{dtdpath}/catalog
+%xmlcat_create $RPM_BUILD_ROOT%{xmlcat_file}
 
-xmlcatalog --noout --create $RPM_BUILD_ROOT%{dtdpath}/catalog.xml
+%xmlcat_add_rewrite \
+       http://www.oasis-open.org/docbook/xml/%{ver} \
+       file://%{dtd_path} \
+       $RPM_BUILD_ROOT%{xmlcat_file}
 
-xmlcatalog --noout --add rewriteSystem \
-       http://www.oasis-open.org/docbook/xml/%{ver}/ \
-       file://%{dtdpath}/ \
-       $RPM_BUILD_ROOT%{dtdpath}/catalog.xml
-
-grep PUBLIC docbook.cat|grep -v ISO |sed 's/^/xmlcatalog --noout --add /;s/PUBLIC/public/;s=$= '$RPM_BUILD_ROOT'/%{dtdpath}/catalog.xml=' |sh
+grep PUBLIC docbook.cat|grep -v ISO |sed 's/^/xmlcatalog --noout --add /;s/PUBLIC/public/;s=$= '$RPM_BUILD_ROOT'/%{xmlcat_file}=' |sh
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -q /etc/sgml/xml-docbook-%{ver}.cat /etc/sgml/catalog ; then
-       /usr/bin/install-catalog --add /etc/sgml/xml-docbook-%{ver}.cat %{dtdpath}/catalog > /dev/null
+    %sgmlcat_add /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+
 fi
 if ! grep -q %{dtdpath}/catalog.xml /etc/xml/catalog ; then
-       /usr/bin/xmlcatalog --noout --add nextCatalog "" %{dtdpath}/catalog.xml /etc/xml/catalog
+    %xmlcat_add %{xmlcat_file}
+
 fi
 
 %preun
 if [ "$1" = "0" ] ; then
-       /usr/bin/install-catalog --remove /etc/sgml/xml-docbook-%{ver}.cat %{dtdpath}/catalog > /dev/null
-       /usr/bin/xmlcatalog --noout --del %{dtdpath}/catalog.xml /etc/xml/catalog
+    %sgmlcat_del /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+
+    %xmlcat_del %{xmlcat_file}
+
 fi
 
 %files