openjade: Add dependencies, improve catalog actions.

Reference #74

diff --git a/openjade/openjade.nm b/openjade/openjade.nm
index 26ff5fa0fdb195de03abfe3dd1018c49a823b309..fe2ca1a871c5d7fc9adc0628c0dd5b2ddfe951c6 100644 (file)
--- a/openjade/openjade.nm
+++ b/openjade/openjade.nm
@@ -5,7 +5,7 @@
 
 name       = openjade
 version    = 1.3.2
-release    = 1
+release    = 2
 
 groups     = Application/Text
 url        = http://openjade.sourceforge.net/
@@ -53,8 +53,16 @@ packages
                        jade
                end
 
+               requires
+                       docbook-dtds>=1.0-3
+                       libxml2
+                       opensp>=1.5.2-2
+                       sgml-common
+               end
+
                prerequires +=\
-                       docbook-dtds \
+                       docbook-dtds>=1.0-3 \
+                       libxml2 \
                        sgml-common 
 
                script postin
@@ -62,13 +70,10 @@ packages
                        /usr/bin/install-catalog --add /etc/sgml/openjade-%{version}.soc \
                                /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null
 
-                       # Integrate openjade catalog into docbook catalogs.
-                       for dir in /usr/share/sgml/docbook/*; do
-                               dir=$(basename ${dir})
-                               fmt=${dir%%-*}
-                               ver=${dir##*-}
-                                       /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/${fmt}-docbook-${ver}.cat \
-                                               /usr/share/sgml/openjade-%{version}/catalog > /dev/null 2>/dev/null
+                       # Add openjade catalog to docbook catalogs.
+                       for catalog in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --sgml --noout --add ${catalog} \
+                                       /usr/share/sgml/openjade-%{version}/catalog /dev/null 2>/dev/null
                        done
                end
 
@@ -78,12 +83,9 @@ packages
                                /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null
 
                        # Remove openjade catalog from docbook catalogs.
-                       for dir in /usr/share/sgml/docbook/*; do
-                               dir=$(basename ${dir})
-                               fmt=${dir%%-*}
-                               ver=${dir##*-}
-                                       /usr/bin/xmlcatalog --sgml --noout --remove /etc/sgml/${fmt}-docbook-${ver}.cat \
-                                               /usr/share/sgml/openjade-%{version}/catalog > /dev/null 2>/dev/null
+                       for catalog in /etc/sgml/*-docbook-*.cat; do
+                               /usr/bin/xmlcatalog --sgml --noout --remove ${catalog} \
+                                       /usr/share/sgml/openjade-%{version}/catalog > /dev/null 2>/dev/null
                        done
                end
        end