--- a/build-g11n-spec.sh	Tue Nov 23 19:07:33 2010 +0100
+++ b/build-g11n-spec.sh	Thu Dec 16 17:14:49 2010 +0900
@@ -16,6 +16,12 @@
     exit 1
 fi
 
+date
+
+IPS_VENDORVER=0.${L10N_BUILDNUM:-"155"}
+PUBLISHER=${L10N_PUBLISHER:-"l10n-nightly"}
+GLOBAL_PKGDEST=${PKGDEST}
+
 export PATH=/usr/bin:/usr/sbin
 source /opt/jdsbld/bin/env.sh
 export PYTHON=/usr/bin/python2.6
@@ -39,7 +45,10 @@
         TOPDIR="`pwd`/$(dirname $0)"
     fi
 fi
-mkdir -p $TOPDIR/log
+
+MACH="${MACH:-`uname -p`}"
+BLDDIR="$TOPDIR/build.$MACH"
+mkdir -p $BLDDIR/log
 
 # set the http and ftp proxies if you are behind a firewall
 # export http_proxy=
@@ -54,11 +63,30 @@
 fi
 
 if [ -z $1 ]; then
-    SPECFILES="cmdassist.spec stardict.spec icu.spec idnkit.spec"
+    SPECFILES="cmdassist.spec icu.spec idnkit.spec"
 else
     SPECFILES=$@
 fi
 
+# Explicitly specifying location to enable to use pkgtool (pkgbuild)
+# not yet in jdsbld.
+PKGTOOL="/opt/pkgbuild/bin/pkgtool"
+
+# IPS repos are created in $PKGDEST if defined in environment,
+# otherwise in $BLDDIR (build.$MACH).
+IPS_REPODIR="${GLOBAL_PKGDEST:-$BLDDIR}/repo.spec"
+SRC_IPS_REPODIR="${GLOBAL_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 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}
+
 G11NDIR=$(dirname $0)
 for spec in $SPECFILES
 do
@@ -66,7 +94,7 @@
     cmdassist.spec )
         cd $G11NDIR
         cp cmdassist/COPYING cmdassist/cmdassist.copyright
-        VERSION=`egrep "Version:" cmdassist/cmdassist.spec | awk '{print $2}'`
+        VERSION=`egrep "^Version:" cmdassist/cmdassist.spec | awk '{print $2}'`
         mv cmdassist cmdassist-${VERSION}
         /usr/bin/tar cf - cmdassist-${VERSION} | /usr/bin/gzip > cmdassist-${VERSION}.tar.gz
         mv cmdassist-${VERSION}.tar.gz cmdassist-${VERSION}/
@@ -90,27 +118,27 @@
 
     SPECDIRS=$TOPDIR/$dir:$TOPDIR/include
     PATCHDIRS=$TOPDIR/$dir/patches
-    SRCDIRS=$TOPDIR/$dir:$TOPDIR/SOURCES
+    SRCDIRS=$TOPDIR/$dir
 
     PKGUNINSTALLARGS="uninstall-pkgs --nonotify --specdirs=$SPECDIRS"
-    PKGBUILDARGS="$CMD --nonotify --download --topdir=$TOPDIR --specdirs=$SPECDIRS "
+    PKGBUILDARGS="$CMD --nonotify --download --topdir=$BLDDIR --specdirs=$SPECDIRS "
     PKGBUILDARGS="$PKGBUILDARGS --sourcedirs=$SRCDIRS --patchdirs=$PATCHDIRS"
-    PKGBUILDARGS="$PKGBUILDARGS --logdir=$TOPDIR/log"
+    PKGBUILDARGS="$PKGBUILDARGS --logdir=$BLDDIR/log"
+    PKGBUILDARGS="$PKGBUILDARGS --pkgformat=ips"
 
     if [ $CMD = 'build' ]; then
         echo "pkgtool $PKGUNINSTALLARGS $spec"
-        pkgtool $PKGUNINSTALLARGS $spec
+        $PKGTOOL $PKGUNINSTALLARGS $spec
     fi
-    echo "pkgtool $PKGBUILDARGS $spec"
-    pkgtool $PKGBUILDARGS $spec
+    echo "$PKGTOOL $PKGBUILDARGS --define \"ipsvendorver $IPS_VENDORVER\" $spec"
+    $PKGTOOL $PKGBUILDARGS --define "ipsvendorver $IPS_VENDORVER" $spec
+
+    # tentative workaround: should eliminate the previous mv instead,
+    # after verifying that directory name does not affect build result
+    if [ "$spec" = "cmdassist.spec" ]
+    then
+        mv "$dir" cmdassist
+    fi
 done
 
-# This is used for nightly build env
-if [ X$NOTCPFLAG = X ]; then
-    ( cd $TOPDIR/PKGS
-#        rm -f *.bz2
-        for pkg in `find . -type d -name "SUNW*" | cut -c3-`; do
-            tar cf - $pkg | bzip2 > $pkg.tar.bz2
-        done
-    )
-fi
+date

--- a/cmdassist/cmdassist.spec	Tue Nov 23 19:07:33 2010 +0100
+++ b/cmdassist/cmdassist.spec	Thu Dec 16 17:14:49 2010 +0900
@@ -9,6 +9,9 @@
 Version: 	2.0
 Release:	1
 License: 	CDDL
+IPS_Package_Name:	gnome/cmdassist
+IPS_Component_Version:	%{ipscompverdefault}
+Meta(info.classification):	%{ipsclass_gnome_doc}
 Source: 	%{src_name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{src_name}-%{version}-build
 SUNW_Copyright:	%{src_name}.copyright

--- a/icu/icu.spec	Tue Nov 23 19:07:33 2010 +0100
+++ b/icu/icu.spec	Thu Dec 16 17:14:49 2010 +0900
@@ -22,7 +22,9 @@
 Release: 1
 Summary: International Components for Unicode
 Copyright: X License
-Group: System Environment/Libraries
+IPS_Package_Name:	library/icu
+IPS_Component_Version:	%{ipscompverdefault}
+Meta(info.classification):	%{ipsclass_sys_i18n}
 #Source: %{src_url}/%{version}/icu4c-%{pkgversion}-src.tgz
 Source1: old_libs.tar.gz
 #Sun patches
@@ -77,7 +79,7 @@
 
 %package -n SUNWicud
 Summary: International Components for Unicode (development files)
-Group: Development/Libraries
+IPS_Package_Name:	developer/icu
 %include icu.depend
 Requires: SUNWicu
 %description -n SUNWicud

--- a/idn/idnkit.spec	Tue Nov 23 19:07:33 2010 +0100
+++ b/idn/idnkit.spec	Thu Dec 16 17:14:49 2010 +0900
@@ -34,7 +34,9 @@
 Version:      %{version}
 Release:      %{release}
 Copyright:    distributable
-Group:        System Environment
+IPS_Package_Name:	library/idnkit
+IPS_Component_Version:	%{ipscompverdefault}
+Meta(info.classification):	%{ipsclass_sys_i18n}
 Source:       %{src_url}/%{distsrc}.tar.gz
 Source1:      sunothers.tar.gz
 Source2:      idnconv.tar.gz
@@ -78,7 +80,7 @@
 %package -n SUNWidnd
 Summary: Internationalized Domain Name Support Developer Files
 SUNW_BaseDir:   %{_basedir}
-Group: Development/Libraries
+IPS_Package_Name:	library/idnkit/header-idnkit
 %include default-depend.inc
 Requires: SUNWidnl
 
@@ -86,7 +88,7 @@
 Summary: Internationalized Domain Name Support Utilities
 Version: 1.7
 SUNW_BaseDir:   %{_basedir}
-Group: Development/Libraries
+IPS_Package_Name:	network/dns/idnconv
 %include default-depend.inc
 SUNW_Copyright: idnu.copyright
 Requires: SUNWidnl

--- a/include/Solaris.inc	Tue Nov 23 19:07:33 2010 +0100
+++ b/include/Solaris.inc	Thu Dec 16 17:14:49 2010 +0900
@@ -18,6 +18,14 @@
 %define is_s10    %(test `uname -r` = 5.10 && echo 1 || echo 0)
 %define _patch_options --fuzz=0 --unified
 
+%define ipscompverdefault	0.5.11
+IPS_Build_Version:	5.11
+IPS_Vendor_Version:	%{ipsvendorver}
+
+%define	ipsclass_pref08	org.opensolaris.category.2008
+%define	ipsclass_sys_i18n	%{ipsclass_pref08}:System/Internationalization
+%define	ipsclass_gnome_doc	%{ipsclass_pref08}:Desktop (GNOME)/Documentation
+
 SUNW_Category:             %{default_category}
 SUNW_HotLine:              Please contact your local service provider
 SUNW_MaxInst:              1000
@@ -84,6 +92,8 @@
 %define classification_prefix  org.opensolaris.category.2008
 
 # ChangeLog:
+# 2010-12-03  Takeshi Asano <[email protected]>
+# - add tags and definitions for IPS
 # 2010-06-04  Alan Coopersmith <[email protected]>
 # - Make cc_is_gcc work with names like gcc-4.3.3 and parfait-gcc
 # 2010-04-24  Dave Lin <[email protected]>

--- a/include/default-depend.inc	Tue Nov 23 19:07:33 2010 +0100
+++ b/include/default-depend.inc	Thu Dec 16 17:14:49 2010 +0900
@@ -7,5 +7,4 @@
 Requires: SUNWkvm
 Requires: SUNWcsr
 Requires: SUNWcsu
-Requires: SUNWcsd
 Requires: SUNWcsl

--- a/include/prod.inc	Tue Nov 23 19:07:33 2010 +0100
+++ b/include/prod.inc	Thu Dec 16 17:14:49 2010 +0900
@@ -1,7 +1,7 @@
 #
 # Default settings for GNOME packages on Solaris
 #
-# Copyright 2009 Sun Microsystems, Inc.
+# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 SUNW_ProdName:             GNOME
 SUNW_ProdVers:             2.31.4
@@ -15,13 +15,15 @@
 %define default_category   GNOME2,application,%{jds_version}
 %{?support_level:#}%define support_level      unsupported
 
-Vendor:			   Sun Microsystems, Inc.
+Vendor:			   Oracle Corporation
 
 %define                    pkg_prefix SUNW
 
 %define                    restart_fmri $BASEDIR/share/desktop-cache/restart_fmri
 
 # ChangeLog:
+# 2010-12-03  Takeshi Asano <[email protected]>
+# - Vendor change to Oracle
 # 2009-10-08  Laszlo (Laca) Peter  <[email protected]>
 # - define default_python_version
 # 2009-04-03  Laszlo (Laca) Peter  <[email protected]>