removed the lines those were used to rename atspi2 spec files, which have been removed from gnome2.30 branch; improve the cmd line of "pkgtool uninstall-pkgs ..." gnome-2-30
authordavelam
Wed, 30 Jun 2010 03:36:34 +0000
branchgnome-2-30
changeset 18337 a540efd3b7dd
parent 18336 06183e206cf5
child 18338 d47911796855
removed the lines those were used to rename atspi2 spec files, which have been removed from gnome2.30 branch; improve the cmd line of "pkgtool uninstall-pkgs ..."
cron-script.sh
--- a/cron-script.sh	Mon Jun 28 01:45:53 2010 +0000
+++ b/cron-script.sh	Wed Jun 30 03:36:34 2010 +0000
@@ -134,7 +134,8 @@
 if ! /usr/bin/cmp -s ./cron-script.sh $MYNAME; then exec ./cron-script.sh; fi
 
 # uninstall all pkgs left behind by a previous build
-pkgtool uninstall-pkgs --with-l10n --with-indiana-branding --define 'support_level supported' specs/*.spec >/dev/null
+pkgtool uninstall-pkgs --nonotify --with-l10n --download --without-dt --with-indiana-branding --without-blueprint --define 'jds_version JDS4' --define 'support_level supported'  specs/*.spec 
+
 # remove-gnome will now remove anything left from uninstall-pkgs in case
 # or a packaging change for example
 $SPECDIR/scripts/remove-gnome --version jds -q -f --no_extras > /dev/null 2>&1
@@ -165,10 +166,6 @@
 /usr/gnu/bin/make 
 
 cd $SPECDIR
-#FIXME: atspi2 has conflicts with a11y-libs
-for f in SUNWpyatspi.spec SUNWat-spi2-core.spec SUNWat-spi2-atk.spec; do
-    mv specs/$f specs/$f.bad
-done
 
 #FIXME: The smf service could not run correctly in jail, hack the script here.
 if [ -f /THIS_IS_JAIL_* ]; then