--- a/ChangeLog	Fri Feb 20 12:51:04 2009 +0000
+++ b/ChangeLog	Sun Feb 22 13:44:17 2009 +0000
@@ -1,3 +1,7 @@
+2009-02-22  Dave Lin <[email protected]>
+
+        * cron-script.sh: Changed to build SUNWgnome-img-organizer with SS12.
+
 2009-02-20  Takao Fujiwara  <[email protected]>
 
 	* closed/SUNWzz-gnome-l10n.spec: Updated to add SUNWbrasero-l10n

--- a/cron-script.sh	Fri Feb 20 12:51:04 2009 +0000
+++ b/cron-script.sh	Sun Feb 22 13:44:17 2009 +0000
@@ -133,25 +133,6 @@
 # checkout-out SVN copy *MUST* be read-only, or "update" needs passwd
 svn -q up > /dev/null 2>&1 || fatal_error "SVN update failed"
 
-# change some components to use Sun Studio 11 to 
-# workaround the compiler related issue(CR6706089)
-ss11_env_fl=/home/gbuild/dave/env.sh.ss11.cconly
-ss11_specs="SUNWgnome-img-organizer.spec"
-if [ -f $ss11_env_fl -a "`uname -p`" = "i386" ]; then
-    cd $SPECDIR
-    IFS_save=$IFS
-    IFS="
-"
-    for spec in $ss11_specs; do
-        sed -e "/^%build/a\\
-source $ss11_env_fl" \
-            -e "/^%install/a\\
-source $ss11_env_fl" $spec > ${spec}.tmp.$$
-        mv ${spec}.tmp.$$ $spec 
-    done
-    IFS=$IFS_save
-fi
-
 # if the script changed during cvs update, restart with the updated script
 cd $SPECDIR
 if ! /usr/bin/cmp -s ./cron-script.sh $MYNAME; then exec ./cron-script.sh; fi