rpms/docbook-style-dsssl/F-13 docbook-style-dsssl.spec,1.23,1.24

[Ondrej Vasik]

Author: ovasik

Update of /cvs/pkgs/rpms/docbook-style-dsssl/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31576

Modified Files:
	docbook-style-dsssl.spec 
Log Message:
do not touch openjade catalogs by this package - it's done in docbook-dtds (#600878)


Index: docbook-style-dsssl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/docbook-style-dsssl/F-13/docbook-style-dsssl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- docbook-style-dsssl.spec	2 Feb 2010 11:14:32 -0000	1.23
+++ docbook-style-dsssl.spec	7 Jun 2010 14:03:27 -0000	1.24
@@ -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 styleshe
 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 at redhat.com> - 1.79-11
+- do not touch openjade catalogs by this package - it's
+  done in docbook-dtds (#600878)
+
 * Tue Feb 02 2010 Ondrej Vasik <ovasik at redhat.com> - 1.79-10
 - fix merge review issues(#225703)