--- a/java-1.7.0-icedtea.spec	Thu Aug 23 15:53:30 2007 -0400
+++ b/java-1.7.0-icedtea.spec	Fri Aug 24 17:57:25 2007 -0400
@@ -12,7 +12,9 @@
 
 %define genurl http://icedtea.classpath.org/hg/fedora/raw-file/d30f0842b5c3/
 
-%define accessver 1.19.2
+%define accessmajorver 1.19
+%define accessminorver 2
+%define accessver %{accessmajorver}.%{accessminorver}
 %define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
@@ -89,7 +91,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.12.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.13.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -99,7 +101,7 @@
 Source1:  %{openjdkurl}%{openjdkzip}
 # Save icedtea.classpath.org space and bandwidth.
 NoSource: 1
-Source2:  %{accessurl}java-access-bridge-%{accessver}.tar.gz
+Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
 Source3:  %{genurl}generate-cacerts.pl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -227,18 +229,6 @@
 %description javadoc
 The IcedTea API documentation.
 
-%ifnarch x86_64
-%package rmi
-Summary: IcedTea RMI CGI Script
-Group:   Applications/Internet
-
-Requires: %{name} = %{version}-%{release}
-Requires: %{cgibindir}
-
-%description rmi
-The IcedTea RMI CGI script.
-%endif
-
 %package plugin
 Summary: IcedTea Web Browser Plugin
 Group:   Applications/Internet
@@ -278,16 +268,9 @@
 
 pushd %{buildoutputdir}/j2sdk-image
 
-%ifnarch x86_64
-  # Fix up java-rmi.cgi PATH.
-  perl -p -i -e 's|PATH=.*|PATH=%{jrebindir}|' bin/java-rmi.cgi
-
-  # Install java-rmi.cgi.
-  install -d -m 755 $RPM_BUILD_ROOT%{cgibindir}
-  install -m 755 bin/java-rmi.cgi \
-    $RPM_BUILD_ROOT%{cgibindir}/java-rmi-%{name}.cgi
+  # Assume that java-rmi.cgi is not used.
+  # http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4418631
   rm -f bin/java-rmi.cgi
-%endif
 
   # Install main files.
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
@@ -503,7 +486,6 @@
   --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
   --slave %{_bindir}/javah javah %{sdkbindir}/javah \
   --slave %{_bindir}/javap javap %{sdkbindir}/javap \
-  --slave %{_bindir}/java-rmi.cgi java-rmi.cgi %{sdkbindir}/java-rmi.cgi \
   --slave %{_bindir}/jconsole jconsole %{sdkbindir}/jconsole \
   --slave %{_bindir}/jdb jdb %{sdkbindir}/jdb \
   --slave %{_bindir}/jhat jhat %{sdkbindir}/jhat \
@@ -708,17 +690,15 @@
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}
 
-%ifnarch x86_64
-%files rmi
-%defattr(-,root,root,-)
-%{cgibindir}/java-rmi-%{name}.cgi
-%endif
-
 %files plugin
 %defattr(-,root,root,-)
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Fri Aug 24 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.13.b18.snapshot
+- Remove RMI CGI script and subpackage.
+- Fix Java Access Bridge for GNOME URL.
+
 * Thu Aug 23 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.12.b18.snapshot
 - Fully qualify Java Access Bridge for GNOME and generate-cacerts
   source paths.