--- a/build-g11n-spec.sh	Fri Jul 15 10:35:25 2011 +0200
+++ b/build-g11n-spec.sh	Fri Aug 05 17:50:38 2011 +0900
@@ -82,17 +82,12 @@
     # IPS repos are created in $PKGDEST if defined in environment,
     # otherwise in $BLDDIR (build.$MACH).
     IPS_REPODIR="${PKGDEST:-$BLDDIR}/repo.spec"
-    SRC_IPS_REPODIR="${PKGDEST:-$BLDDIR}/repoS.spec"
 
     export PKGBUILD_IPS_SERVER="file://$IPS_REPODIR/"
-    export PKGBUILD_SRC_IPS_SERVER="file://$SRC_IPS_REPODIR/"
 
     rm -rf "$IPS_REPODIR"
-    pkgrepo create --version 3 "$PKGBUILD_IPS_SERVER"
+    pkgrepo create "$PKGBUILD_IPS_SERVER"
     pkgrepo set -s "$PKGBUILD_IPS_SERVER" publisher/prefix=${PUBLISHER}
-    rm -rf "$SRC_IPS_REPODIR"
-    pkgrepo create --version 3 "$PKGBUILD_SRC_IPS_SERVER"
-    pkgrepo set -s "$PKGBUILD_SRC_IPS_SERVER" publisher/prefix=${PUBLISHER}
 fi
 
 for spec in $SPECFILES
@@ -127,7 +122,7 @@
     if $(test `uname -r` != 5.10); then
         PKGUNINSTALLARGS="uninstall-pkgs --nonotify --specdirs=$SPECDIRS"
         PKGBUILDARGS="$CMD --nonotify --download --topdir=$BLDDIR --specdirs=$SPECDIRS "
-        PKGBUILDARGS="$PKGBUILDARGS --pkgformat=ips"
+        PKGBUILDARGS="$PKGBUILDARGS --pkgformat=ips --nosourcepkg"
     else
         PKGUNINSTALLARGS="uninstall-pkgs --specdirs=$SPECDIRS"
         PKGBUILDARGS="$CMD --download --topdir=$BLDDIR --specdirs=$SPECDIRS "

--- a/include/Solaris.inc	Fri Jul 15 10:35:25 2011 +0200
+++ b/include/Solaris.inc	Fri Aug 05 17:50:38 2011 +0900
@@ -1,7 +1,7 @@
 #
 # Macro definitions for Solaris packages
 #
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 %include prod.inc
@@ -23,6 +23,9 @@
 %define ipscompverdefault	0.5.11
 IPS_Build_Version:	5.11
 IPS_Vendor_Version:	%{ipsvendorver}
+
+Meta(variant.opensolaris.zone): global,nonglobal
+Meta(org.opensolaris.consolidation): l10n
 %endif
 
 %define	ipsclass_pref08	org.opensolaris.category.2008