--- a/ChangeLog	Fri May 16 12:17:56 2008 +0000
+++ b/ChangeLog	Fri May 16 13:24:39 2008 +0000
@@ -1,4 +1,22 @@
-2008-05-14  Stephen Browne  <[email protected]>
+2008-05-16  Stephen Browne  <[email protected]>
+
+	* SUNWgnome-panel.spec: remove conditional BuildRequires
+
+	* base-specs/gnome-desktop.spec:
+	* base-specs/gnome-panel.spec:
+	* base-specs/gnome-settings-daemon.spec:
+	* base-specs/libwnck.spec:
+	* base-specs/nautilus.spec: remove conditional build of tx patches
+
+	* SUNWtgnome-tsol-libs.spec:
+	* SUNWtgnome-tsoljdsdevmgr.spec:
+	* SUNWtgnome-tsoljdslabel.spec:
+	* SUNWtgnome-tsoljdsselmgr.spec:
+	* SUNWtgnome-tstripe.spec:remove bogus package dependancy on SUNWxwts
+
+	* SUNWtgnome-xagent.spec: remove conditional build
+
+2008-05-16  Stephen Browne  <[email protected]>
 
 	* SUNWtgnome-tsol-libs.spec:
 	* SUNWtgnome-tsoljdsdevmgr.spec:

--- a/SUNWgnome-panel.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWgnome-panel.spec	Fri May 16 13:24:39 2008 +0000
@@ -60,9 +60,7 @@
 Requires: SUNWiso-codes
 Requires: SUNWdbus
 
-%if %build_tjds
 BuildRequires: SUNWtgnome-tsol-libs-devel
-%endif
 %if %option_without_fox
 %ifarch i386
 Requires: SUNWxorg-xkb

--- a/SUNWtgnome-tsol-libs.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-tsol-libs.spec	Fri May 16 13:24:39 2008 +0000
@@ -27,10 +27,8 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWxwts
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
-BuildRequires: SUNWxwts
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-libs-devel
 

--- a/SUNWtgnome-tsoljdsdevmgr.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-tsoljdsdevmgr.spec	Fri May 16 13:24:39 2008 +0000
@@ -25,12 +25,10 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWxwts
 Requires: SUNWtsu
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-panel
 Requires: SUNWtgnome-tsol-libs
-BuildRequires: SUNWxwts
 BuildRequires: SUNWtsu
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel

--- a/SUNWtgnome-tsoljdslabel.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-tsoljdslabel.spec	Fri May 16 13:24:39 2008 +0000
@@ -27,13 +27,11 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-BuildRequires: SUNWxwts
 BuildRequires: SUNWtgnome-tsol-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
-Requires: SUNWxwts
 Requires: SUNWtgnome-tsol-libs
 Requires: SUNWgnome-component
 Requires: SUNWgnome-config

--- a/SUNWtgnome-tsoljdsselmgr.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-tsoljdsselmgr.spec	Fri May 16 13:24:39 2008 +0000
@@ -25,14 +25,12 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-BuildRequires: SUNWxwts
 BuildRequires: SUNWtsu
 BuildRequires: SUNWtgnome-tsol-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-libs-devel
 BuildRequires: SUNWgnome-vfs-devel
-Requires: SUNWxwts
 Requires: SUNWtsu
 Requires: SUNWtgnome-tsol-libs
 Requires: SUNWgnome-component

--- a/SUNWtgnome-tstripe.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-tstripe.spec	Fri May 16 13:24:39 2008 +0000
@@ -25,11 +25,9 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires: SUNWxwts
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-panel
 Requires: SUNWtgnome-tsol-libs
-BuildRequires: SUNWxwts
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
 BuildRequires: SUNWtgnome-tsol-libs-devel

--- a/SUNWtgnome-xagent.spec	Fri May 16 12:17:56 2008 +0000
+++ b/SUNWtgnome-xagent.spec	Fri May 16 13:24:39 2008 +0000
@@ -26,8 +26,6 @@
 SUNW_Copyright:          %{name}.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 
-%if %build_tjds
-
 %include default-depend.inc
 BuildRequires: SUNWxorg-headers
 Requires: SUNWgnome-vfs-root
@@ -103,9 +101,11 @@
 %dir %attr (0755, root, bin) /usr/dt/config
 /usr/dt/config/tsoljds-migration
 
-%endif
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remove conditional build
+
 * Wed May 07 2008 - [email protected]
 - Remove PERL5LIB setting as it is not necessary.
 

--- a/base-specs/gnome-desktop.spec	Fri May 16 12:17:56 2008 +0000
+++ b/base-specs/gnome-desktop.spec	Fri May 16 13:24:39 2008 +0000
@@ -96,9 +96,7 @@
 %patch1 -p1
 %endif
 %patch2 -p1
-%if %build_tjds
 %patch3 -p1
-%endif
 
 %build
 %ifos linux
@@ -189,6 +187,8 @@
 %{_libdir}/libgnome-desktop-2.so
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remove conditional build of tx patch
 * Wed May 07 2008 - [email protected]
 - new patch 05-gnome-about-label-size.diff, fix bugster:6695640
   bugzilla:104753

--- a/base-specs/gnome-panel.spec	Fri May 16 12:17:56 2008 +0000
+++ b/base-specs/gnome-panel.spec	Fri May 16 13:24:39 2008 +0000
@@ -144,9 +144,7 @@
 %patch9 -p1
 %endif
 %patch10 -p1
-%if %build_tjds
 %patch11 -p1
-%endif
 %patch12 -p1
 %patch14 -p1
 %patch15 -p1
@@ -266,6 +264,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remove conditional build of tx patch
 * Wed May 14 2008 - [email protected]
 - Add patch  gnome-panel-19-add-libsocket.diff to fix build error
 * Wed May 07 2008 - [email protected]

--- a/base-specs/gnome-settings-daemon.spec	Fri May 16 12:17:56 2008 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Fri May 16 13:24:39 2008 +0000
@@ -101,9 +101,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%if %build_tjds
 %patch4 -p1
-%endif
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
@@ -220,6 +218,8 @@
 %{_libdir}/*.so
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remove conditional build of tx patch
 * Thu May 06 2008 - [email protected]
 - Fix g-s-d so that it can find /usr/lib/esd.
 * Thu May 01 2008 - [email protected]

--- a/base-specs/libwnck.spec	Fri May 16 12:17:56 2008 +0000
+++ b/base-specs/libwnck.spec	Fri May 16 13:24:39 2008 +0000
@@ -62,9 +62,7 @@
 bzcat %SOURCE1 | tar xf -
 cd po-sun; make; cd ..
 %endif
-%if %build_tjds
 %patch1 -p1
-%endif
 %patch2 -p1
 
 %build
@@ -121,6 +119,8 @@
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remove conditional build of tx patch
 * Wed Apr 09 2008 - [email protected]
 - Bump to 2.22.1.  Remove upstream patch, 03-fixcrash.
 * Tue Mar 11 2008 - [email protected]

--- a/base-specs/nautilus.spec	Fri May 16 12:17:56 2008 +0000
+++ b/base-specs/nautilus.spec	Fri May 16 13:24:39 2008 +0000
@@ -145,9 +145,7 @@
 %if %option_with_indiana_branding
 %patch9 -p1
 %endif
-%if %build_tjds
 %patch10 -p1
-%endif
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -245,6 +243,8 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Fri May 16 2008 - [email protected]
+- remve conditional build of tx patch
 * Tue May 06 2008 - [email protected]
 - Add patches/nautilus-13-redirect-cd-window.diff for 6680894
 * Fri May 02 2008 - [email protected]