- spaces->tabs

- sorted BRs

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

diff --git a/docbook-dtd42-xml.spec b/docbook-dtd42-xml.spec
index 4e6bd962462dc59a2c15f642935285bdf284a12f..7a9add6be6f43f1c60a3836160f328c174a7da08 100644 (file)
--- a/docbook-dtd42-xml.spec
+++ b/docbook-dtd42-xml.spec
@@ -1,9 +1,7 @@
-

 #
 # todo:
 # - use XML ISO entities from sgml-common
 #
 #
 # todo:
 # - use XML ISO entities from sgml-common
 #

-

 Summary:       XML/SGML DocBook DTD 4.2
 Summary(pl):   XML/SGML DocBook DTD 4.2
 %define ver    4.2
 Summary:       XML/SGML DocBook DTD 4.2
 Summary(pl):   XML/SGML DocBook DTD 4.2
 %define ver    4.2


@@ -17,9 +15,9 @@ Group:                Applications/Publishing/XML
 URL:           http://www.oasis-open.org/docbook/
 Source0:       http://www.oasis-open.org/docbook/xml/%{ver}/docbook-xml-%{ver}.zip
 # Source0-md5: 73fe50dfe74ca631c1602f558ed8961f
 URL:           http://www.oasis-open.org/docbook/
 Source0:       http://www.oasis-open.org/docbook/xml/%{ver}/docbook-xml-%{ver}.zip
 # Source0-md5: 73fe50dfe74ca631c1602f558ed8961f

-BuildRequires: unzip
-BuildRequires: rpm-build >= 4.0.2-94

 BuildRequires: libxml2-progs
 BuildRequires: libxml2-progs

+BuildRequires: rpm-build >= 4.0.2-94
+BuildRequires: unzip

 PreReq:                libxml2
 PreReq:                sgml-common
 Requires(post,preun):  /usr/bin/install-catalog
 PreReq:                libxml2
 PreReq:                sgml-common
 Requires(post,preun):  /usr/bin/install-catalog


@@ -28,9 +26,9 @@ Requires:     libxml2-progs >= 2.4.17-6
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-%define dtd_path               %{_datadir}/sgml/docbook/xml-dtd-%{ver}
-%define        xmlcat_file             %{dtd_path}/catalog.xml
-%define        sgmlcat_file    %{dtd_path}/catalog
+%define                dtd_path                %{_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
 
 %description
 DocBook is an XML/SGML vocabulary particularly well suited to books


@@ -69,20 +67,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -q /etc/sgml/xml-docbook-%{ver}.cat /etc/sgml/catalog ; then
 
 %post
 if ! grep -q /etc/sgml/xml-docbook-%{ver}.cat /etc/sgml/catalog ; then

-    %sgmlcat_add /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+       %sgmlcat_add /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}

 
 fi
 if ! grep -q %{xmlcat_file} /etc/xml/catalog ; then
 
 fi
 if ! grep -q %{xmlcat_file} /etc/xml/catalog ; then

-    %xmlcat_add %{xmlcat_file}
+       %xmlcat_add %{xmlcat_file}

 
 fi
 
 %preun
 if [ "$1" = "0" ] ; then
 
 fi
 
 %preun
 if [ "$1" = "0" ] ; then

-    %sgmlcat_del /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
-
-    %xmlcat_del %{xmlcat_file}
-
+       %sgmlcat_del /etc/sgml/xml-docbook-%{ver}.cat %{sgmlcat_file}
+       %xmlcat_del %{xmlcat_file}

 fi
 
 %files
 fi
 
 %files