rpms/docbook-dtds/devel docbook-dtds.spec,1.25,1.26

[Ondrej Vasik]

Author: ovasik

Update of /cvs/extras/rpms/docbook-dtds/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29574

Modified Files:
	docbook-dtds.spec 
Log Message:
Removed openjade requirement - registration reworked to trigger(#234345)


Index: docbook-dtds.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-dtds/devel/docbook-dtds.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- docbook-dtds.spec	24 Sep 2008 14:49:00 -0000	1.25
+++ docbook-dtds.spec	25 Sep 2008 13:11:57 -0000	1.26
@@ -1,6 +1,8 @@
+%define openjadever 1.3.2
+
 Name: docbook-dtds
 Version: 1.0
-Release: 40%{?dist}
+Release: 41%{?dist}
 Group: Applications/Text
 
 Summary: SGML and XML document type definitions for DocBook
@@ -69,9 +71,6 @@
 Patch6: docbook-dtds-ents.patch
 BuildRequires: unzip
 
-%define openjadever 1.3.2
-Requires: openjade = %{openjadever}
-
 %description
 The DocBook Document Type Definition (DTD) describes the syntax of
 technical documentation texts (articles, books and manual pages).
@@ -512,105 +511,66 @@
     # DocBook V3.0
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V3.1
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.0
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook V4.1
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.1-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/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
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
     # DocBook XML V4.5
     /usr/bin/xmlcatalog --sgml --noout --add \
     /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
-    /usr/share/sgml/openjade-%{openjadever}/catalog
-    /usr/bin/xmlcatalog --sgml --noout --add \
-    /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
     /usr/share/sgml/docbook/dsssl-stylesheets-$STYLESHEETS/catalog
 
 fi
@@ -1092,6 +1052,144 @@
 # Finally, make sure everything in /etc/sgml is readable!
 /bin/chmod a+r /etc/sgml/*
 
+%triggerin -- openjade >= %{?openjadever}
+#openjade catalog registration
+  # DocBook V3.0
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V3.1
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.0
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.1
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /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.5
+  /usr/bin/xmlcatalog --sgml --noout --add \
+  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+#openjade registration trigger end
+
+%triggerun -- openjade >= %{?openjadever}
+  [ $2 = 0 ] || exit 0
+  #openjade catalog unregistration
+  # DocBook V3.0
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-3.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V3.1
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-3.1-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.0
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.0-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.1
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /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 --del \
+  /etc/sgml/xml-docbook-4.1.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.2
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.2
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.2-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.3
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.3
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.3-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook V4.4
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.4
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.4-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+ 
+  # DocBook V4.5
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/sgml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+
+  # DocBook XML V4.5
+  /usr/bin/xmlcatalog --sgml --noout --del \
+  /etc/sgml/xml-docbook-4.5-%{version}-%{release}.cat \
+  /usr/share/sgml/openjade-%{openjadever}/catalog
+#openjade unregistration trigger end
+
+ 
 %postun
 ##
 ## SGML catalog
@@ -1483,6 +1581,10 @@
 fi
 
 %changelog
+* Fri Sep 26 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-41
+- Removed openjade requirement - registration reworked to 
+  triggers(#234345)
+
 * Wed Sep 24 2008 Ondrej Vasik <ovasik at redhat.com> - 1.0-40
 - Fix wrong filenames for xml-dtd-4.4 and xml-dtd-4.5 
   iso entities(#461206)