rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk.spec,1.33,1.34

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3173

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.2
- Remove the annoying JNLP tmp dir dialog
- Merge from devel
- Build do not build IcedTea plugin for x86_64



Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- java-1.6.0-openjdk.spec	27 Oct 2008 16:05:18 -0000	1.33
+++ java-1.6.0-openjdk.spec	29 Oct 2008 20:14:51 -0000	1.34
@@ -103,6 +103,12 @@
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
 
+%ifarch x86_64
+%define browser_plugin gcjwebplugin.so
+%else
+%define browser_plugin IcedTeaPlugin.so
+%endif
+
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
 Release: 1.0.%{openjdkver}%{?dist}.2
@@ -352,7 +358,12 @@
 %ifarch sparc64
 export ARCH_DATA_MODEL=64
 %endif
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
+  --with-pkgversion=6%{openjdkver}-Fedora-EPEL-%{rhel} \
+%ifarch x86_64
+  --disable-liveconnect --enable-gcjwebplugin
+%endif
+
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 pushd openjdk-ecj
@@ -522,7 +533,7 @@
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
   | grep -v jre/lib/security \
-  | grep -v IcedTeaPlugin.so \
+  | grep -v %{browser_plugin} \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   >> %{name}.files
 # Find demo directories.
@@ -759,23 +770,28 @@
 exit 0
 
 %post plugin
-alternatives --remove %{javaplugin} \
+if [ $1 -eq 2 ]
+then
+  alternatives --remove %{javaplugin} \
     %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+fi
 
 alternatives \
   --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \
-  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so %{priority}
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/%{browser_plugin} %{priority}
 
 exit 0
 
+%ifnarch x86_64
 %postun plugin
 if [ $1 -eq 0 ]
 then
   alternatives --remove %{javaplugin} \
-    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/IcedTeaPlugin.so
+    %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
 fi
 
 exit 0
+%endif
 
 %files -f %{name}.files
 %defattr(-,root,root,-)
@@ -881,12 +897,13 @@
 %files plugin
 %defattr(-,root,root,-)
 %doc README.plugin
-%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
+%{_jvmdir}/%{jredir}/lib/%{archinstall}/%{browser_plugin}
 
 %changelog
 * Mon Oct 27 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.2
-- Remove the tmpdir dialog from JNLP client (#467591)
-- BuildRequire xulrunner, so that xulrunner-devel does not pull in firefox
+- Remove the annoying JNLP tmp dir dialog
+- Merge from devel
+- Build do not build IcedTea plugin for x86_64
 
 * Fri Oct 24 2008 Lubomir Rintel <lkundrak at v3.sk> - 1:1.6.0.0-1.0.b12.1
 - Merge 1.3.1 with IcedTeaPlugin from devel.