From 81006e35c637f51917fdd2f7ce34e79a3f55f6f6 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Thu, 19 Feb 2009 12:09:03 +0000
Subject: [PATCH] register sgml catalogs before xml catalogs in openjade
 (#486257)

---
 docbook-dtds.spec | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/docbook-dtds.spec b/docbook-dtds.spec
index d5dfd38..54bea4c 100644
--- a/docbook-dtds.spec
+++ b/docbook-dtds.spec
@@ -2,7 +2,7 @@
 
 Name: docbook-dtds
 Version: 1.0
-Release: 42%{?dist}
+Release: 43%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -1078,46 +1078,46 @@ fi
   /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
   /usr/share/sgml/openjade-%{openjadever}/catalog
 
-  # DocBook XML V4.1.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
   # DocBook V4.2
   /usr/bin/xmlcatalog --sgml --noout --add \
   /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
   /usr/share/sgml/openjade-%{openjadever}/catalog
 
-  # DocBook XML V4.2
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
   # DocBook V4.3
   /usr/bin/xmlcatalog --sgml --noout --add \
   /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
   /usr/share/sgml/openjade-%{openjadever}/catalog
 
-  # DocBook XML V4.3
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
   # DocBook V4.4
   /usr/bin/xmlcatalog --sgml --noout --add \
   /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
   /usr/share/sgml/openjade-%{openjadever}/catalog
 
-  # DocBook XML V4.4
-  /usr/bin/xmlcatalog --sgml --noout --add \
-  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
-  /usr/share/sgml/openjade-%{openjadever}/catalog
-
   # DocBook V4.5
   /usr/bin/xmlcatalog --sgml --noout --add \
   /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
   /usr/share/sgml/openjade-%{openjadever}/catalog
 
+  # DocBook XML V4.1.2
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.2
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.3
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.4
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
   # DocBook XML V4.5
   /usr/bin/xmlcatalog --sgml --noout --add \
   /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
@@ -1585,6 +1585,10 @@ then
 fi
 
 %changelog
+* Thu Feb 19 2009 Ondrej Vasik <ovasik@redhat.com> - 1.0-43
+- register sgml catalogs before xml catalogs in openjade
+  (#486257)
+
 * Thu Feb 05 2009 Ondrej Vasik <ovasik@redhat.com> - 1.0-42
 - Use SYSTEM rewrite for web URL's in sgml catalogs to
   prevent reading from the network(#478680)