X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdocbook-dtd42-xml.git;a=blobdiff_plain;f=docbook-dtd42-xml.spec;h=1987a67a2b32d521e854fd0efba04cbcb4201d6a;hp=911f15a1af9cb3d077fda236227f8ecffa4e0b49;hb=c3bc11ece25b9b617de987c5c564e87c90daeb67;hpb=50242669d3d35a90cdc17ff08a9c07219cd2d6e9

diff --git a/docbook-dtd42-xml.spec b/docbook-dtd42-xml.spec
index 911f15a..1987a67 100644
--- a/docbook-dtd42-xml.spec
+++ b/docbook-dtd42-xml.spec
@@ -9,15 +9,19 @@ Summary(pl):	XML/SGML DocBook DTD 4.2
 %define ver	4.2
 Name:		docbook-dtd42-xml
 Version:	1.0
-Release:	1
+Release:	3
 Vendor:		OASIS
 License:	Free
 Group:		Applications/Publishing/XML
 URL:		http://www.oasis-open.org/docbook/
 Source0:	http://www.oasis-open.org/docbook/xml/%{ver}/docbook-xml-%{ver}.zip
 BuildRequires:  unzip
+BuildRequires:	/usr/bin/xmlcatalog
+PreReq:		libxml2
+PreReq:		sgml-common
+Requires(post,preun):   /usr/bin/install-catalog
 Requires(post,preun):   /usr/bin/xmlcatalog
-Requires:   libxml2-progs >= 2.4.17-6
+Requires:	libxml2-progs >= 2.4.17-6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -25,15 +29,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define	xmlcat_file		%{dtd_path}/catalog.xml
 %define	sgmlcat_file	%{dtd_path}/catalog
 
-#
-# I would put following macros into /usr/lib/rpm/macros.sgml.
-#
-%define xmlcat_add()			/usr/bin/xmlcatalog --noout --add nextCatalog "" %1 /etc/xml/catalog
-%define xmlcat_del()			/usr/bin/xmlcatalog --noout --del %1 /etc/xml/catalog
-%define xmlcat_add_rewrite	    /usr/bin/xmlcatalog --noout --add rewriteSystem 
-%define sgmlcat_add()			/usr/bin/install-catalog --add %1 %2 > /dev/null
-%define sgmlcat_del()			/usr/bin/install-catalog --remove %1 %2 > /dev/null
-
 %description
 DocBook is an XML/SGML vocabulary particularly well suited to books and papers
 about computer hardware and software (though it is by no means limited to only
@@ -53,18 +48,12 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{dtd_path}
 
 install *.{xml,dtd,mod} $RPM_BUILD_ROOT%{dtd_path}
+install *.ent $RPM_BUILD_ROOT%{dtd_path} || :
 cp -a ent $RPM_BUILD_ROOT%{dtd_path}
 
-cat << EOF >> $RPM_BUILD_ROOT%{sgmlcat_file}
-OVERRIDE YES
-  -- default decl --
-SGMLDECL "../../xml.dcl"
-  -- hacks for opensp --
-SYSTEM "file://%{_datadir}/sgml/docbook/xml-dtd-%{ver}/docbookx.dtd" "%{dtd_path}/docbookx.dtd"
-SYSTEM "http://www.oasis-open.org/docbook/xml/%{ver}/docbookx.dtd"   "%{dtd_path}/docbookx.dtd"
+%sgmlcat_fix $RPM_BUILD_ROOT%{sgmlcat_file} %{ver}
 
-EOF
-grep -v 'ISO ' docbook.cat >> $RPM_BUILD_ROOT%{sgmlcat_file}
+cat docbook.cat >> $RPM_BUILD_ROOT%{sgmlcat_file}
 
 %xmlcat_add_rewrite \
 	http://www.oasis-open.org/docbook/xml/%{ver} \
@@ -76,16 +65,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -q /etc/sgml/xml-docbook-%{ver}.cat /etc/sgml/catalog ; then
-    sgmlcat_add /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_del}
+    %sgmlcat_add /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+
 fi
-if ! grep -q %{dtdpath}/catalog.xml /etc/xml/catalog ; then
-    xmlcat_add %{dtdpath}/catalog.xml
+if ! grep -q %{xmlcat_file} /etc/xml/catalog ; then
+    %xmlcat_add %{xmlcat_file}
+
 fi
 
 %preun
 if [ "$1" = "0" ] ; then
-    sgmlcat_del /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
-    xmlcat_del %{dtdpath}/catalog.xml
+    %sgmlcat_del /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+
+    %xmlcat_del %{xmlcat_file}
+
 fi
 
 %files