From 0c8b202b4c51e445e452beff4e0f2c82febce0c2 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik@fedoraproject.org>
Date: Mon, 7 Jun 2010 13:47:42 +0000
Subject: [PATCH] do not register openjade catalogs in docbook-dtds catalogs(it
 is done there     - #601188)

---
 docbook-style-dsssl.spec | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/docbook-style-dsssl.spec b/docbook-style-dsssl.spec
index 25ec3d7..a9d039f 100644
--- a/docbook-style-dsssl.spec
+++ b/docbook-style-dsssl.spec
@@ -1,6 +1,6 @@
 Name: docbook-style-dsssl
 Version: 1.79
-Release: 10%{?dist}
+Release: 11%{?dist}
 Group: Applications/Text
 
 Summary: Norman Walsh's modular stylesheets for DocBook
@@ -8,12 +8,9 @@ Summary: Norman Walsh's modular stylesheets for DocBook
 License: Copyright only
 URL: http://docbook.sourceforge.net/
 
-%define openjadever 1.3.2
-Requires: openjade = %{openjadever}
 Requires: docbook-dtds
+Requires: openjade
 Requires: sgml-common
-#We need this specific version of openjade because of catalog location
-Requires: openjade = %{openjadever}
 Requires(post): sgml-common
 Requires(preun): sgml-common
 
@@ -59,21 +56,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-rel=$(echo /etc/sgml/sgml-docbook-3.0-*.cat)
-rel=${rel##*-}
-rel=${rel%.cat}
 for centralized in /etc/sgml/*-docbook-*.cat
 do
-  /usr/bin/install-catalog --remove $centralized \
-    /usr/share/sgml/docbook/dsssl-stylesheets-*/catalog \
-    >/dev/null 2>/dev/null
-done
-
-for centralized in /etc/sgml/*-docbook-*$rel.cat
-do
-  /usr/bin/install-catalog --add $centralized \
-    /usr/share/sgml/openjade-%{openjadever}/catalog \
-    > /dev/null 2>/dev/null
   /usr/bin/install-catalog --add $centralized \
     /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog \
     > /dev/null 2>/dev/null
@@ -83,13 +67,17 @@ done
 %preun
 if [ "$1" = "0" ]; then
   for centralized in /etc/sgml/*-docbook-*.cat
-  do   /usr/bin/install-catalog --remove $centralized /usr/share/sgml/openjade-%{openjadever}/catalog > /dev/null 2>/dev/null
+  do
     /usr/bin/install-catalog --remove $centralized /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null
   done
 fi
 exit 0
 
 %changelog
+* Mon Jun 07 2010 Ondrej Vasik <ovasik@redhat.com> - 1.79-11
+- do not register openjade catalogs in docbook-dtds catalogs
+  (it is done there - #601188)
+
 * Tue Feb 02 2010 Ondrej Vasik <ovasik@redhat.com> - 1.79-10
 - fix merge review issues(#225703)