--- a/Solaris/ChangeLog	Sun Aug 13 04:02:24 2006 +0000
+++ b/Solaris/ChangeLog	Sun Aug 13 14:14:10 2006 +0000
@@ -1,3 +1,8 @@
+2006-08-13  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWgnome-base-libs.spec: delete %pre script (hack) and SUNWj5rt
+	  dep since we changed the icon dirs back to root:other
+
 2006-08-12  Laszlo (Laca) Peter  <[email protected]>
 
 	* SUNWgnome-a11y-dasher.spec, SUNWgnome-applets.spec,

--- a/Solaris/SUNWgnome-base-libs.spec	Sun Aug 13 04:02:24 2006 +0000
+++ b/Solaris/SUNWgnome-base-libs.spec	Sun Aug 13 14:14:10 2006 +0000
@@ -67,10 +67,6 @@
 Requires: SUNWpostrun
 Requires: SUNWPython
 Requires: SUNWperl584core
-# FIXME: remove the SUNWj5rt dep and the preinstall script once
-# SUNWj5rt's postinstall script is updated with the new GNOME directory
-# attributes
-Requires: SUNWj5rt
 BuildRequires: SUNWgnome-common-devel
 BuildRequires: SUNWxorg-headers
 BuildRequires: SUNWjpg-devel
@@ -336,55 +332,6 @@
       $BASEDIR/var/lib/postrun/postrun -u -c JDS
 %endif
 
-%pre
-# This is temporary stuff until while in the process of fixing the GNOME
-# directory permissions.  This preinstall script and the SUNWj5rt dep should
-# be removed once everything's updated
-INSTALLF=/usr/sbin/installf
-SHARE_PATH=${BASEDIR}/share
-
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH} d 0755 root sys
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/pixmaps d 0755 root other
-chgrp bin ${SHARE_PATH}/icons
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrast
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrast d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrast/48x48
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrast/48x48 d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrast/48x48/apps
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrast/48x48/apps d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrastInverse
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrastInverse d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrastInverse/48x48
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrastInverse/48x48 d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/HighContrastInverse/48x48/apps
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/HighContrastInverse/48x48/apps d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/LowContrast
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/LowContrast d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/LowContrast/48x48
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/LowContrast/48x48 d 0755 root bin
-chgrp bin ${SHARE_PATH}/icons/LowContrast/48x48/apps
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/icons/LowContrast/48x48/apps d 0755 root bin
-chgrp bin ${SHARE_PATH}/control-center-2.0
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/control-center-2.0 d 0755 root bin
-chgrp bin ${SHARE_PATH}/control-center-2.0/capplets
-$INSTALLF -c none ${PKGINST} \
-      ${SHARE_PATH}/control-center-2.0/capplets d 0755 root bin
-$INSTALLF -f -c none ${PKGINST}
-
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -501,6 +448,9 @@
 %endif
 
 %changelog
+* Sun Aug 13 2006 - [email protected]
+- delete %pre script (hack) and SUNWj5rt dep since we changed the icon dirs
+  back to root:other
 * Fri Jul 14 2006 - [email protected]
 - update %post/%postun/etc scripts to support diskless client setup,
   part of 6448317