rpms/rarian/F-8 rarian.spec,1.11,1.12

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28315

Modified Files:
	rarian.spec 
Log Message:

* Wed Sep 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-4
- Require libxml2 in %post and %posun (RH bug #433268).
- Silence xmlcatalog commands (RH bug #433315).



Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/F-8/rarian.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rarian.spec	11 Feb 2008 19:48:41 -0000	1.11
+++ rarian.spec	17 Sep 2008 14:41:58 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name: rarian
 Version: 0.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
@@ -13,8 +13,10 @@
 
 ### Dependencies ###
 
-Requires: libxml2
+Requires(post): libxml2
+Requires(postun): libxml2
 # for /usr/bin/xmlcatalog
+
 Requires: libxslt
 # for /usr/bin/xsltproc
 Requires: coreutils, util-linux, gawk
@@ -83,10 +85,10 @@
 CATALOG=/etc/xml/catalog
 /usr/bin/xmlcatalog --noout --add "rewriteSystem" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 /usr/bin/xmlcatalog --noout --add "rewriteURI" \
   "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
-  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG >& /dev/null || :
 
 %postun -p /sbin/ldconfig
 
@@ -120,6 +122,10 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Wed Sep 17 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-4
+- Require libxml2 in %%post and %%posun (RH bug #433268).
+- Silence xmlcatalog commands (RH bug #433315).
+
 * Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-3
 - Install XML DTD for scrollkeeper OMF files (RH bug #431088).