updated: java-1.6.0-openjdk

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1847 ec354946-7b23-47d6-9f5a-488ba84defc7

j/java-1.6.0-openjdk/java-1.6.0-openjdk-vl.spec

@@ -43,29 +43,29 @@
 %ifarch %{ix86}
 %define archbuild i586
 %define archinstall i386
-%define buildoutputdir openjdk/build/linux-i586
 %endif
 %ifarch x86_64
 %define archbuild amd64
 %define archinstall amd64
-%define buildoutputdir openjdk/build/linux-amd64
 %endif
 # 32 bit sparc, optimized for v9
 %ifarch sparcv9
 %define archbuild sparc
 %define archinstall sparc
-%define buildoutputdir openjdk/build/linux-sparc
 %endif
 # 64 bit sparc
 %ifarch sparc64
 %define archbuild sparcv9
 %define archinstall sparcv9
-%define buildoutputdir openjdk/build/linux-sparcv9
 %endif
-#%%ifnarch %{jit_arches}
-#%%define archbuild %{_arch}
-#%%define archinstall %{_arch}
-#%%endif
+%ifnarch %{ix86} x86_64 sparcv9 sparc64
+%define archbuild %{_arch}
+%define archinstall %{_arch}
+%endif
+#ifnarch %{jit_arches}
+#define archbuild %{_arch}
+#define archinstall %{_arch}
+#endif
 
 # Reduce build time from 27 hours to 12 hours by only running test
 # suites on JIT architectures.
@@ -73,7 +73,7 @@
 %define runtests 0
 %endif
 
-#define buildoutputdir openjdk/build/linux-%{archbuild}
+%define buildoutputdir openjdk/build/linux-%{archbuild}
 
 %if %{gcjbootstrap}
 %define icedteaopt %{nil}
@@ -404,7 +404,6 @@ The OpenJDK web browser plugin.
 #cp %{SOURCE7} .
 #cp %{SOURCE8} .
 
-
 %build
 unset which
 # Build IcedTea and OpenJDK.
@@ -999,8 +998,8 @@ exit 0
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
 
 %changelog
-* Sat Sep  4 2010 Shu KONNO <owa@bg.wakwak.com> - 1.6.0.0-2.b18
-- fixed: archbuild, archinstall are overwritten
+* Sun Sep 20 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0.0-2.b18
+- fixed buildsourcedir for ppc
 
 * Sat Sep  4 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.6.0.0-1.b18
 - Initial build for Vine Linux