--- a/SUNWtgnome-xagent.spec	Tue Sep 16 10:42:48 2008 +0000
+++ b/SUNWtgnome-xagent.spec	Tue Sep 16 10:50:33 2008 +0000
@@ -68,15 +68,6 @@
 
 %install
 %gsession.install -d %name-%version
-install -d  $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
-install --mode=0755 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/README  $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
-install --mode=0755 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/AUTHORS  $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
-bzip2 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/ChangeLog
-install --mode=0755 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/ChangeLog.bz2 $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
-bzip2 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/COPYING
-install --mode=0755 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/COPYING.bz2  $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
-bzip2 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/NEWS
-install  --mode=0755 SUNWtgnome-xagent-%{version}/gnome-session-%{gsession.version}/NEWS.bz2  $RPM_BUILD_ROOT/%{_datadir}/doc/SUNWtgnome-xagent-%{version}
 install -d $RPM_BUILD_ROOT/usr/dt/config
 install --mode=0755 %SOURCE1 $RPM_BUILD_ROOT/usr/dt/config
 rm -Rf $RPM_BUILD_ROOT%{_sysconfdir}
@@ -94,11 +85,7 @@
 rm -Rf $RPM_BUILD_ROOT%{_bindir}/gnome-wm
 rm -Rf $RPM_BUILD_ROOT%{_bindir}/gnome-smproxy
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/flash.gif
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/applications
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/gnome
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/gnome-session
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/icons
-rm -Rf $RPM_BUILD_ROOT%{_datadir}/xsessions
+rm -Rf $RPM_BUILD_ROOT%{_datadir}
 rm -Rf $RPM_BUILD_ROOT%{_libdir}
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):supported" $RPM_BUILD_ROOT}
@@ -108,9 +95,10 @@
 
 
 %files
+%doc -d gnome-session-%{gsession.version} README AUTHORS
+%doc(bzip2) -d gnome-session-%{gsession.version} COPYING NEWS ChangeLog
 %dir %attr (0755, root, other) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/SUNWtgnome-xagent-%{version}/*
 %defattr (-, root, other)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/tsoljds-xagent