rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.17,1.18

[Dennis Gilmore (ausil)]

Author: ausil

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9340

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
enable building on sparc and other non native supported arches using zero 



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- java-1.6.0-openjdk.spec	1 Apr 2008 03:27:29 -0000	1.17
+++ java-1.6.0-openjdk.spec	8 Apr 2008 15:17:35 -0000	1.18
@@ -33,8 +33,13 @@
 %define archbuild ppc64
 %define archinstall ppc64
 %else
+%ifarch %{ix86}
 %define archbuild i586
 %define archinstall i386
+%else
+%define archbuild zero
+%define archinstall zero
+%endif
 %endif
 %endif
 %endif
@@ -55,7 +60,7 @@
 
 # Hard-code libdir on 64-bit architectures to make the 64-bit JDK
 # simply be another alternative.
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %define syslibdir       %{_prefix}/lib64
 %define _libdir         %{_prefix}/lib
 %define archname        %{name}.%{_arch}
@@ -78,7 +83,7 @@
 
 # Standard JPackage directories and symbolic links.
 # Make 64-bit JDKs just another alternative on 64-bit architectures.
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %define sdklnk          java-%{javaver}-%{origin}.%{_arch}
 %define jrelnk          jre-%{javaver}-%{origin}.%{_arch}
 %define sdkdir          %{name}-%{version}.%{_arch}
@@ -90,7 +95,7 @@
 %define jredir          %{sdkdir}/jre
 %define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
 %define jrebindir       %{_jvmdir}/%{jrelnk}/bin
-%ifarch x86_64 ppc64
+%ifarch x86_64 ppc64 sparc64
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}.%{_arch}
 %else
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
@@ -101,7 +106,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.7.%{openjdkver}%{?dist}
+Release: 0.8.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -177,7 +182,7 @@
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 # zero-assembler build requirement
-%ifarch ppc ppc64
+%ifnarch x86_64 %{ix86}
 BuildRequires: libffi-devel
 %endif
 
@@ -786,6 +791,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Apr 07 2008 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0.0-0.8.b08
+- enable building for all arches using zero where there is not a native port
+
 * Mon Mar 31 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.7.b08
 - Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons.
 - Updated release.