From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 17 Oct 2011 19:07:36 +0000 (+0200)
Subject: openjade: Add dependencies, improve catalog actions.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c26b32927ec4bb31c482dfc6b7f505e8d0c647b6;p=people%2Famarx%2Fipfire-3.x.git

openjade: Add dependencies, improve catalog actions.

Reference #74
---

diff --git a/openjade/openjade.nm b/openjade/openjade.nm
index 26ff5fa0f..fe2ca1a87 100644
--- 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