--- a/ChangeLog	Sat Aug 18 07:44:37 2007 +0000
+++ b/ChangeLog	Sat Aug 18 15:18:15 2007 +0000
@@ -1,3 +1,20 @@
+2007-08-18  Damien Carbery <[email protected]>
+
+	* SUNWgnome-applets.spec: Comment out removal of %{_prefix}/var dir as
+	  it's no longer created.
+	* base-specs/gcalctool.spec: Comment out removal of %{_prefix}/var and
+	  %{_prefix}/var/lib dirs as they are no longer created.
+	* SUNWgnome-img-viewer.spec: Comment out removal of /var and /usr/var
+	  dirs as they are no longer installed.
+	* base-specs/gnome-keyring-manager.spec: Comment out removal of /var 
+          dirs as they are no longer installed.
+	* SUNWgnome-system-monitor.spec: Comment out removal of /var dirs as
+          they are no longer installed.
+	* SUNWgnome-system-tools.spec: Comment out removal of /var dirs as
+          they are no longer installed.
+	* SUNWgnome-terminal.spec: Comment out removal of /var dir as it is no
+	  longer installed.
+
 2007-08-18  Damien Carbery <[email protected]>
 
 	* SUNWgnome-a11y-dasher.spec: Add -f to rm call to delete /var in

--- a/SUNWgnome-applets.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/SUNWgnome-applets.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -220,7 +220,7 @@
 
 chmod 0644 $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/C/*.xml
 
-rm -r $RPM_BUILD_ROOT%{_prefix}/var
+#rm -r $RPM_BUILD_ROOT%{_prefix}/var
 
 # Never install English locales because should support full functions
 # on English locales as same as Solaris. See SUNWzz-gnome-l10n.spec.
@@ -707,6 +707,8 @@
 # %{_datadir}/omf/gnome-netstatus/*-[a-z][a-z]_*.omf
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of %{_prefix}/var dir as it's no longer created.
 * Tue Aug 07 2007 - [email protected]
 - Update l10n %files for new deskbar-applet tarball.
 * Wed Aug 01 2007 - [email protected]

--- a/SUNWgnome-img-viewer.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/SUNWgnome-img-viewer.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -141,8 +141,8 @@
 rm $RPM_BUILD_ROOT%{_datadir}/omf/eog/eog-[a-z][a-z]_[A-Z][A-Z].omf
 %endif
 # Remove scrollkeeper files.
-rm -r $RPM_BUILD_ROOT/var
-rm -r $RPM_BUILD_ROOT%{_prefix}/var
+#rm -r $RPM_BUILD_ROOT/var
+#rm -r $RPM_BUILD_ROOT%{_prefix}/var
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}(eog):$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -257,6 +257,8 @@
 %{_includedir}/*
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of /var and /usr/var dirs as they are no longer installed.
 * Thu Aug 16 2007 - [email protected]
 - Remove actions icons from %files after tarball bump.
 * Wed Jul 11 2007 - [email protected]

--- a/SUNWgnome-system-monitor.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/SUNWgnome-system-monitor.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -179,6 +179,8 @@
 %endif
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of /var dirs as they are no longer installed.
 * Thu Apr 26 2007 - [email protected]
 - set CXX to $CXX -norunpath because libtool swallows this option sometimes
   and leaves compiler paths in the binaries

--- a/SUNWgnome-system-tools.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/SUNWgnome-system-tools.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -102,9 +102,9 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 #FIXME: Remove scrollkeeper files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/var/scrollkeeper
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-rmdir $RPM_BUILD_ROOT/var
+#rm -rf $RPM_BUILD_ROOT%{_prefix}/var/scrollkeeper
+#rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
+#rmdir $RPM_BUILD_ROOT/var
 #Delete all files we don't need at the moment from /usr/share/setup-tool-backends/scripts/
 rm $RPM_BUILD_ROOT%{_datadir}/setup-tool-backends/scripts/boot*
 rm $RPM_BUILD_ROOT%{_datadir}/setup-tool-backends/scripts/dhcpd*
@@ -211,6 +211,8 @@
 %config %class(rbac) %attr (0644, root, sys) %{_sysconfdir}/security/exec_attr
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of /var dirs as they are no longer installed.
 * Wed Jun 27 2007 - [email protected]
 - Fix for bug#6555581 - wrapper script for network-admin to first check
   whether NWAM is running.

--- a/SUNWgnome-terminal.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/SUNWgnome-terminal.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -103,7 +103,7 @@
 cd %{_builddir}/%name-%version/sun-manpages
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rmdir $RPM_BUILD_ROOT/usr/var
+#rmdir $RPM_BUILD_ROOT/usr/var
 
 %if %build_l10n
 %else
@@ -218,6 +218,8 @@
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of /var dir as it is no longer installed.
 * Tue Apr 24 2007 - [email protected]
 - s/0755/-/ in defattr so that files are not made all executable
 * Wed Jan 24 2007 - [email protected]

--- a/base-specs/gcalctool.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/base-specs/gcalctool.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -80,8 +80,8 @@
 make -i install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-rmdir $RPM_BUILD_ROOT/var/lib
-rmdir $RPM_BUILD_ROOT/var
+#rmdir $RPM_BUILD_ROOT/var/lib
+#rmdir $RPM_BUILD_ROOT/var
 
 #Copy zh_HK from zh_TW
 #Fixes bug 4930405
@@ -109,6 +109,10 @@
 %{_mandir}/man1/
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of %{_prefix}/var and %{_prefix}/var/lib dirs as they are
+  no longer created.
+
 * Wed Aug 15 2007 - [email protected]
 - Bump to 5.19.90.
 

--- a/base-specs/gnome-keyring-manager.spec	Sat Aug 18 07:44:37 2007 +0000
+++ b/base-specs/gnome-keyring-manager.spec	Sat Aug 18 15:18:15 2007 +0000
@@ -75,9 +75,9 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make -i install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
-rmdir $RPM_BUILD_ROOT/var/lib
-rmdir $RPM_BUILD_ROOT/var
+#rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
+#rmdir $RPM_BUILD_ROOT/var/lib
+#rmdir $RPM_BUILD_ROOT/var
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -101,6 +101,8 @@
 %{_sysconfdir}/gconf/schemas/
 
 %changelog
+* Sat Aug 18 2007 - [email protected]
+- Comment out removal of /var dirs as they are no longer installed.
 * Tue Mar 13 2007 - [email protected]
 - Bump to 2.18.0.
 * Mon Dec 18 2006 - [email protected]