--- a/ChangeLog	Fri Aug 22 10:28:15 2008 +0000
+++ b/ChangeLog	Fri Aug 22 11:54:05 2008 +0000
@@ -1,3 +1,11 @@
+2008-08-22  Stephen Browne  <[email protected]>
+
+	* SUNWtgnome-tsoljdsdevmgr.spec: uprev tarball, remove upstream patches
+	* SUNWtgnome-tsoljdslabel.spec: uprev tarball, remove upstream patches
+	add %if option_with_dt to conditionally build startup scripts for
+	nevada and opensolaris
+	* indiana/indiana-branded.speclist: add SUNWtgnome-tsoljdslabel.spec
+
 2008-08-22  Laszlo (Laca) Peter  <[email protected]>
 
 	* SUNWgnome-themes.spec: fix build when blueprint is included

--- a/SUNWtgnome-tsoljdsdevmgr.spec	Fri Aug 22 10:28:15 2008 +0000
+++ b/SUNWtgnome-tsoljdsdevmgr.spec	Fri Aug 22 11:54:05 2008 +0000
@@ -11,16 +11,12 @@
 
 # NOTE: If the version is bumped the new tarball must be uploaded to the
 #       Sun Download Center. Contact GNOME RE for assistance.
-%define devmgr_version 0.6.2
+%define devmgr_version 0.6.3
 
 Name:                    SUNWtgnome-tsoljdsdevmgr
 Summary:                 GNOME Trusted Device Manager
 Version:                 %{default_pkg_version}
 Source:			 http://dlc.sun.com/osol/jds/downloads/extras/tjds/tsoljdsdevmgr-%{devmgr_version}.tar.bz2
-# date:2008-07-10 owner:dcarbery type:bug
-Patch1:                  tsoljdsdevmgr-01-gtk-disable-deprecated.diff
-# date:2008-08-05 owner:fujiwara type:bug bugster:6727185 state:upstream
-Patch2:                  tsoljdsdevmgr-02-no-gettext.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -48,8 +44,6 @@
 
 %prep
 %setup -q -n tsoljdsdevmgr-%{devmgr_version}
-%patch1 -p1
-%patch2 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
@@ -93,6 +87,9 @@
 %endif
 
 %changelog
+* Fri Aug 22 2008 - [email protected]
+- Uprev version, remove upstream patches
+
 * Tue Aug  5 2008 - [email protected]
 - Add tsoljdsdevmgr-02-no-gettext.diff to avoid segv. Fixes 6727185.
 

--- a/SUNWtgnome-tsoljdslabel.spec	Fri Aug 22 10:28:15 2008 +0000
+++ b/SUNWtgnome-tsoljdslabel.spec	Fri Aug 22 11:54:05 2008 +0000
@@ -11,7 +11,7 @@
 
 # NOTE: If the version is bumped the new tarball must be uploaded to the
 #       Sun Download Center. Contact GNOME RE for assistance.
-%define tsoljdslabel_version 0.6.2
+%define tsoljdslabel_version 0.6.3
 
 %include Solaris.inc
 
@@ -19,10 +19,6 @@
 Summary:                 GNOME Trusted Extensions Session Label Selector
 Version:                 %{default_pkg_version}
 Source:			 http://dlc.sun.com/osol/jds/downloads/extras/tjds/tsoljdslabel-%{tsoljdslabel_version}.tar.bz2
-# date:2008-07-10 owner:dcarbery type:bug
-Patch1:                  tsoljdslabel-01-gtk-disable-deprecated.diff
-# date:2008-07-21 owner:jefftsai type:branding
-Patch2:                  tsoljdslabel-02-ssh-agent.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -53,8 +49,6 @@
 
 %prep
 %setup -q -n tsoljdslabel-%{tsoljdslabel_version}
-%patch1 -p1
-%patch2 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
@@ -71,10 +65,18 @@
 autoheader
 automake -acf
 
+%if %option_with_dt
 ./configure --with-gnome-prefix=%{_prefix} \
             --prefix=%{_prefix} \
 	    --sysconfdir=%{_sysconfdir} \
 	    --mandir=%{_mandir}
+%else
+./configure --with-gnome-prefix=%{_prefix} \
+            --prefix=%{_prefix} \
+            --sysconfdir=%{_sysconfdir} \
+	    --with-dtstart \
+            --mandir=%{_mandir}
+%endif
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -132,6 +134,9 @@
 %endif
 
 %changelog
+* Fri Aug 22 2008 - [email protected]
+- Uprev version, remove upstream patches, add --with-dtstart for opensolairs
+
 * Mon Jul 21 2008 - [email protected]
 - Not start ssh-agent since gnome-keyring provides this feature.
 

--- a/indiana/indiana-branded.speclist	Fri Aug 22 10:28:15 2008 +0000
+++ b/indiana/indiana-branded.speclist	Fri Aug 22 11:54:05 2008 +0000
@@ -15,3 +15,4 @@
 SUNWgnome-wm.spec
 SUNWgnome-dtlogin-integration.spec
 SUNWxdg-user-dirs.spec
+SUNWtgnome-tsoljdslabel.spec