--- a/ChangeLog	Thu Jan 24 00:54:46 2008 +0000
+++ b/ChangeLog	Thu Jan 24 01:55:38 2008 +0000
@@ -1,3 +1,10 @@
+2008-01-24  Glynn Foster  <[email protected]>
+
+	* SUNWgnome-help-viewer.spec, base-specs/yelp.spec: Make sure the
+	gconf schemas are installed, otherwise things generally tend to break.
+	Fixes http://defect.opensolaris.org/bz/show_bug.cgi?id=204, along with
+	the addition of SUNWgnome-doc-utils to the LiveCD.
+
 2008-01-24  Glynn Foster  <[email protected]>
 
 	* patches/gnome-panel-10-gnome-sys-suspend.diff: Fix for 

--- a/SUNWgnome-help-viewer.spec	Thu Jan 24 00:54:46 2008 +0000
+++ b/SUNWgnome-help-viewer.spec	Thu Jan 24 01:55:38 2008 +0000
@@ -20,6 +20,7 @@
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+Requires:       SUNWgnome-help-viewer-root
 Requires:	SUNWgnome-libs
 Requires:       SUNWgnome-vfs
 Requires:       SUNWgnome-component
@@ -47,6 +48,13 @@
 BuildRequires:  SUNWlxml
 BuildRequires:  SUNWlxsl
 
+%package root
+Summary:                 %{summary} - / filesystem
+SUNW_BaseDir:            /
+%include default-depend.inc
+Requires: SUNWpostrun-root
+Requires: SUNWgnome-config
+
 %if %build_l10n
 %package l10n
 Summary:                 %{summary} - l10n files
@@ -84,9 +92,6 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-# TODO: Should we keep the gconf files?
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -109,6 +114,28 @@
   echo '/usr/bin/update-desktop-database'
 ) | $BASEDIR/lib/postrun -b -u -c JDS
 
+%post root
+%include gconf-install.script
+
+%preun root
+test -x $BASEDIR/var/lib/postrun/postrun || exit 0
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
+  echo '  exit 0';
+  echo '}';
+  echo 'umask 0022';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
+  echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
+  echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
+  echo 'retval=0';
+  echo 'for schemas in yelp; do' ;
+  echo '  $PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $SDIR/$schemas.schemas || retval=1';
+  echo 'done';
+  echo 'exit $retval'
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -122,6 +149,11 @@
 %dir %attr(0755, root, bin) %{_mandir}/*
 %{_mandir}/*/*
 
+%files root
+%defattr (-, root, sys)
+%attr (0755, root, sys) %dir %{_sysconfdir}
+%{_sysconfdir}/gconf/schemas/yelp.schemas
+
 %if %build_l10n
 %files l10n
 %defattr (-, root, bin)
@@ -130,6 +162,8 @@
 %endif
 
 %changelog
+* Thu Jan 24 2008 - [email protected]
+- Fix up gconf schema install
 * Mon Jan 14 2008 - [email protected]
 - Change ACLOCAL_FLAGS to point to /usr/share/aclocal as freetype2.m4 was moved
   from /usr/sfw/share/aclocal in snv_80 (SUNWfreetype2).

--- a/base-specs/yelp.spec	Thu Jan 24 00:54:46 2008 +0000
+++ b/base-specs/yelp.spec	Thu Jan 24 01:55:38 2008 +0000
@@ -1,7 +1,7 @@
 #
 # spec file for package yelp 
 #
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -111,7 +111,14 @@
 #Fixes bug 4930405
 install -d $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES
 install --mode=0644 $RPM_BUILD_ROOT%{_datadir}/locale/zh_TW/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/locale/zh_HK/LC_MESSAGES/
-                                                                                                                                                             
+
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="yelp.schemas"
+for S in $SCHEMAS; do
+        gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,6 +134,10 @@
 %{_sysconfdir}/gconf/schemas/yelp.schemas
 
 %changelog
+* Thu Jan 24 2008 - [email protected]
+- Make sure the gconf schemas are installed, fixing #204
+  defect.opensolaris.org
+
 * Thu Oct 18 2007 - [email protected]
 - Add patch 02-search-crash fix bugster:6610215 bugzilla:480876