--- a/SUNWgnome-libs.spec	Thu May 03 18:37:52 2007 +0000
+++ b/SUNWgnome-libs.spec	Fri May 04 02:47:53 2007 +0000
@@ -4,7 +4,7 @@
 # includes module(s): scrollkeeper, startup-notification, libgtkhtml,
 # 	              libgnome, libbonoboui, libgnomeui, libexif-gtk
 #
-# Copyright (c) 2003 Sun Microsystems, Inc.
+# Copyright 2007 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -61,6 +61,7 @@
 SUNW_BaseDir:            /
 %include default-depend.inc
 Requires: SUNWpostrun-root
+Requires: SUNWgnome-xml-root
 Requires: SUNWgnome-config
 
 %package devel		
@@ -151,25 +152,15 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-( echo 'xmlcatalog --noout --add "rewriteSystem" \' ;
-  echo '"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" \' ;
-  echo '"file://%{_datadir}/xml/scrollkeeper/dtds" %{_sysconfdir}/xml/catalog'
-) | $BASEDIR/lib/postrun -c JDS
-
 ( echo 'test -x /usr/bin/scrollkeeper-update || exit 0';
   echo '/usr/bin/scrollkeeper-update'
 ) | $BASEDIR/lib/postrun -b -u -c JDS
 
-%preun
-( echo 'xmlcatalog --noout --delete "rewriteSystem" \' ;
+%post root
+( echo 'xmlcatalog --noout --add "rewriteSystem" \' ;
   echo '"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" \' ;
   echo '"file://%{_datadir}/xml/scrollkeeper/dtds" %{_sysconfdir}/xml/catalog'
-) | $BASEDIR/lib/postrun -c JDS
-
-%postun
-rm -rf $PKG_INSTALL_ROOT/var/lib/scrollkeeper
-
-%post root
+) | $BASEDIR/var/lib/postrun/postrun -c JDS
 ( echo 'test -x /usr/bin/gconftool-2 || {';
   echo '  echo "ERROR: gconftool-2 not found"';
   echo '  exit 0';
@@ -182,6 +173,10 @@
 
 %preun root
 test -x $BASEDIR/var/lib/postrun/postrun || exit 0
+( echo 'xmlcatalog --noout --del \' ;
+  echo '"http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0" \' ;
+  echo '%{_sysconfdir}/xml/catalog'
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS
 ( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
   echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
   echo '  exit 0';
@@ -212,6 +207,8 @@
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
 ) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
 
+%postun root
+rm -rf $BASEDIR/var/lib/scrollkeeper
 
 %files
 %defattr (-, root, bin)
@@ -302,6 +299,10 @@
 %endif
 
 %changelog
+* Thu May  3 2007 - [email protected]
+- reshuffle postrun scripts so that adding/removing the scrollkeeper
+  dtd rewrite rule actually works.
+- add dependency on SUNWgnome-xml-root so /etc/xml/catalog exists
 * Thu Apr 19 2007 - [email protected]
 - add postrun scripts that add/delete a rewrite rule for the scrollkeeper
   dtd to /etc/xml/catalog, so that libxml2 can find it locally and not