--- a/java-1.7.0-icedtea.spec	Fri Jul 13 16:49:32 2007 -0400
+++ b/java-1.7.0-icedtea.spec	Fri Jul 13 17:16:44 2007 -0400
@@ -78,7 +78,7 @@
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
 %endif
 
-%define cgibindir       %{_datadir}/%{name}
+%define cgibindir       %{_var}/www/cgi-bin
 
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack 0
@@ -215,6 +215,16 @@
 %description javadoc
 The IcedTea API Documentation.
 
+%package rmi
+Summary: IcedTea RMI CGI Script
+Group:   Applications/Internet
+
+Requires: %{name} = %{version}-%{release}
+Requires: %{cgibindir}
+
+%description rmi
+The IcedTea RMI CGI Script.
+
 %prep
 %setup -q -n icedtea-%{icedteaver}
 gzip -dc %{SOURCE2} | tar -xf -
@@ -243,7 +253,8 @@
   # 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-%{version}.cgi
+    $RPM_BUILD_ROOT%{cgibindir}/java-rmi-%{name}.cgi
+  rm -f bin/java-rmi.cgi
 %endif
 
   # Install main files.
@@ -319,10 +330,7 @@
 
 # Install Javadoc documentation.
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
-cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-pushd $RPM_BUILD_ROOT%{_javadocdir}
-  ln -sf %{name}-%{version} %{name}
-popd
+cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Generate and install cacerts file.
 %{__perl} %{SOURCE3} %{buildoutputdir}/j2sdk-image/bin/keytool
@@ -332,24 +340,24 @@
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
   | grep -v jre/lib/security \
   | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
-  > %{name}-%{version}.files
+  > %{name}.files
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
   | grep -v jre/lib/security \
   | sed 's|'$RPM_BUILD_ROOT'||' \
-  >> %{name}-%{version}.files
+  >> %{name}.files
 # Find demo directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
   $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \
   | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
-  > %{name}-%{version}-demo.files
+  > %{name}-demo.files
 # Find non-documentation demo files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
   $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \
   -type f -o -type l | sort \
   | grep -v README \
   | sed 's|'$RPM_BUILD_ROOT'||' \
-  >> %{name}-%{version}-demo.files
+  >> %{name}-demo.files
 # Find documentation demo files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
   $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \
@@ -357,7 +365,7 @@
   | grep README \
   | sed 's|'$RPM_BUILD_ROOT'||' \
   | sed 's|^|%doc |' \
-  >> %{name}-%{version}-demo.files
+  >> %{name}-demo.files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -546,7 +554,7 @@
   alternatives --remove javadoc %{_javadocdir}/%{name}/api
 fi
 
-%files -f %{name}-%{version}.files
+%files -f %{name}.files
 %defattr(-,root,root,-)
 %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
@@ -620,7 +628,7 @@
 %{cgibindir}
 %endif
 
-%files demo -f %{name}-%{version}-demo.files
+%files demo -f %{name}-demo.files
 %defattr(-,root,root,-)
 
 %files src
@@ -629,11 +637,18 @@
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
+%files rmi
+%defattr(-,root,root,-)
+%{cgibindir}/java-rmi-%{name}.cgi
+
 %changelog
 * Fri Jul 13 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.8.b15
+- Add rmi subpackage.
+- Remove name-version javadoc directory.
+
+* Fri Jul 13 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.8.b15
 - Set man extension to .gz in base and devel post sections.
 
 * Thu Jul 12 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.7.b15