--- a/ChangeLog	Fri May 04 07:12:00 2012 +0000
+++ b/ChangeLog	Fri May 04 15:07:50 2012 +0000
@@ -1,3 +1,11 @@
+2012-04-23  Stephen Browne  <[email protected]>
+
+	RTI: 362502
+	CR : 7108974
+	* patches/tsoljds-tstripe-05-primary-zone.diff: new patch to ignore
+	secondary zones when finding a match to lazy boot.
+	* specs/SUNWtgnome-tstripe.spec: add new patch
+
 2012-05-04  Padraig O'Briain  <[email protected]>
 
 	CR 7148392 Problem with gnome/libraries

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tsoljds-tstripe-05-primary-zone.diff	Fri May 04 15:07:50 2012 +0000
@@ -0,0 +1,12 @@
+diff -urN tstripe.orig/src/xagent-proxy.c tstripe.new/src/xagent-proxy.c
+--- tstripe.orig/src/xagent-proxy.c	2012-04-18 22:14:36.251878855 +0100
++++ tstripe.new/src/xagent-proxy.c	2012-04-18 22:17:01.619969180 +0100
+@@ -666,6 +666,8 @@
+ 	while (fgets (line, sizeof (line), fp) != NULL) {
+ 		if ((zcent = tsol_sgetzcent (line, NULL, NULL)) == NULL)
+ 			continue;
++		if (zcent->zc_match & TSOL_MATCH_SHARED_LABEL)
++			continue;
+ 		if (blequal (sl, &zcent->zc_label)) {
+ 			zonename = strdup (zcent->zc_name);
+ 			tsol_freezcent (zcent);

--- a/specs/SUNWtgnome-tstripe.spec	Fri May 04 07:12:00 2012 +0000
+++ b/specs/SUNWtgnome-tstripe.spec	Fri May 04 15:07:50 2012 +0000
@@ -1,6 +1,6 @@
 #
 # spec file for package SUNWtgnome-tstripe
-#Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+#Copyright (c) 2010, 2012 Oracle and/or its affiliates. All rights reserved.
 #
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
@@ -26,6 +26,7 @@
 Patch2:			 tsoljds-tstripe-02-TPEXEC.diff
 Patch3:                  tsoljds-tstripe-03-pfexec.diff
 Patch4:                  tsoljds-tstripe-04-l10n-updates.diff
+Patch5:                  tsoljds-tstripe-05-primary-zone.diff
 Source1:                 l10n-configure.sh
 SUNW_BaseDir:            %{_basedir}
 SUNW_Copyright:		 %{name}.copyright
@@ -33,15 +34,8 @@
 
 %include default-depend.inc
 %include gnome-incorporation.inc
-Requires: SUNWlibgnomecanvas
-Requires: SUNWgnome-panel
-Requires: SUNWtgnome-tsol-libs
-BuildRequires: SUNWlibgnome-keyring
+BuildRequires: library/gnome/gnome-keyring
 BuildRequires: x11/trusted/libxtsol
-BuildRequires: consolidation/desktop/desktop-incorporation
-#BuildRequires: SUNWlibgnomecanvas-devel
-#BuildRequires: SUNWgnome-panel-devel
-#BuildRequires: SUNWtgnome-tsol-libs-devel
 
 %package l10n
 Summary:                 %{summary} - l10n files
@@ -54,6 +48,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
@@ -118,6 +113,10 @@
 %{_datadir}/locale
 
 %changelog
+* Thu Apr 19 2012 - [email protected]
+- Add patch  tsoljds-tstripe-05-primary-zone.diff to make sure we only try
+  to lazy boot primary zones
+
 * Wed Mar 09 2011 - [email protected]
 - Add patch tsoljds-tstripe-03-pfexec.diff so that the proxy always calls
   tsoljds-xagent with pfexec.