--- a/ChangeLog	Sun Jul 19 17:44:06 2009 +0000
+++ b/ChangeLog	Sun Jul 19 20:04:37 2009 +0000
@@ -1,3 +1,7 @@
+2009-07-19  Christian Kelly  <[email protected]>
+
+	* SUNWgnome-a11y-libs.spec: Fix problem overwriting /usr/java.
+
 2009-07-19  Christian Kelly  <[email protected]>
 
 	* base-specs/file-roller.spec: Bump to 2.27.2.

--- a/SUNWgnome-a11y-libs.spec	Sun Jul 19 17:44:06 2009 +0000
+++ b/SUNWgnome-a11y-libs.spec	Sun Jul 19 20:04:37 2009 +0000
@@ -234,6 +234,8 @@
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %endif
 
+rm -r  $RPM_BUILD_ROOT/usr/java
+
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -293,9 +295,12 @@
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/at-spi-%{at_spi.version}/*
 %{_datadir}/gnome-mag
+
 %if %option_with_java
-%{_basedir}/java/jre/lib/accessibility.properties
-%{_basedir}/java/jre/lib/ext/java-atk-wrapper.jar
+%{_basedir}/jdk/java/jre/lib/accessibility.properties
+%{_basedir}/jdk/java/jre/lib/ext/java-atk-wrapper.jar
+%{_basedir}/jdk/jre/lib/accessibility.properties
+%{_basedir}/jdk/jre/lib/ext/java-atk-wrapper.jar
 %endif
 %{_datadir}/lib/freetts
 
@@ -345,6 +350,8 @@
 %{_libdir}/python2.6/vendor-packages/*
 
 %changelog
+* Sun Jul 19 2009 - [email protected]
+- Started overwriting /usr/java, rm this for now.
 * Thu Jul 16 2009 - [email protected]
 - Bump java-atk-wrapper to 0.27.4
 * Mon Jul 06 2009 - [email protected]