--- a/java-1.7.0-icedtea.spec	Wed Jun 20 13:07:09 2007 -0400
+++ b/java-1.7.0-icedtea.spec	Wed Jul 04 17:52:43 2007 -0400
@@ -5,12 +5,13 @@
 %define gcjbootstrap 1
 
 %define icedteaver 1.1
-%define openjdkver b13
-%define openjdkdate 24_may_2007
+%define openjdkver b14
+%define openjdkdate 21_jun_2007
 
-%define openjdkurlbase http://www.java.net/download/openjdk/
-%define openjdkurlhash 40ec4ed263a6dfce13b8cf18fa046058
-%define openjdkurlpath /jdk7/promoted/%{openjdkver}/
+%define accessver 1.18.0
+
+%define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
+%define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 
 %ifarch x86_64
@@ -52,7 +53,7 @@
 
 # Standard JPackage naming and versioning defines.
 %define origin          icedtea
-%define priority        1700
+%define priority        17000
 %define javaver         1.7.0
 %define buildver        0
 
@@ -80,17 +81,19 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.3.%{openjdkver}%{?dist}
+Release: 0.4.%{openjdkver}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
 License:  GPL
 URL:      http://icedtea.classpath.org/
 Source0:  %{url}download/source/icedtea-%{icedteaver}.tar.gz
-Source1:  %{openjdkurlbase}%{openjdkurlhash}%{openjdkurlpath}%{openjdkzip}
+Source1:  %{openjdkurl}%{openjdkzip}
 # Some questionable license headers prevent us from distributing the
 # OpenJDK zip file in a .src.rpm.
-NoSource: 1
+# NoSource: 1
+Source2:  java-access-bridge-%{accessver}.tar.gz
+Source3:  generate-cacerts.pl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -110,6 +113,14 @@
 %else
 BuildRequires: java-1.7.0-icedtea-devel
 %endif
+# Java Access Bridge for GNOME build requirements.
+BuildRequires: at-spi-devel
+BuildRequires: gawk
+BuildRequires: libbonobo-devel
+BuildRequires: pkgconfig >= 0.9.0
+BuildRequires: xorg-x11-utils
+# Certificate file generation requirements.
+BuildRequires: openssl
 
 # Post requires alternatives to install tool alternatives.
 Requires(post):   %{_sbindir}/alternatives
@@ -189,12 +200,32 @@
 %description src
 The IcedTea source bundle.
 
+%package javadoc
+Summary: IcedTea API Documentation
+Group:   Documentation
+
+# Standard JPackage javadoc provides.
+Provides: java-javadoc = %{version}-%{release}
+Provides: java-%{javaver}-javadoc = %{version}-%{release}
+
+%description javadoc
+The IcedTea API Documentation.
+
 %prep
 %setup -q -n icedtea-%{icedteaver}
+gzip -dc %{SOURCE2} | tar -xf -
 
 %build
 ./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
 make %{icedteatarget}
+pushd java-access-bridge-%{accessver}
+  export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
+  export PATH=$JAVA_HOME/bin:$PATH
+  ./configure
+  make
+  cp -a bridge/accessibility.properties $JAVA_HOME/jre/lib
+  cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
+popd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -207,7 +238,7 @@
 
   # Install java-rmi.cgi.
   install -d -m 755 $RPM_BUILD_ROOT%{cgibindir}
-  install -D -m 755 bin/java-rmi.cgi \
+  install -m 755 bin/java-rmi.cgi \
     $RPM_BUILD_ROOT%{cgibindir}/java-rmi-%{version}.cgi
 %endif
 
@@ -253,13 +284,13 @@
 
   # Install versionless symlinks.
   pushd $RPM_BUILD_ROOT%{_jvmdir}
-  ln -sf %{jredir} %{jrelnk}
-  ln -sf %{sdkdir} %{sdklnk}
+    ln -sf %{jredir} %{jrelnk}
+    ln -sf %{sdkdir} %{sdklnk}
   popd
 
   pushd $RPM_BUILD_ROOT%{_jvmjardir}
-  ln -sf %{sdkdir} %{jrelnk}
-  ln -sf %{sdkdir} %{sdklnk}
+    ln -sf %{sdkdir} %{jrelnk}
+    ln -sf %{sdkdir} %{sdklnk}
   popd
 
   # Remove javaws man page.
@@ -282,17 +313,32 @@
 
 popd
 
+# 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
+
+# Generate and install cacerts file.
+%{__perl} %{SOURCE3} %{buildoutputdir}/j2sdk-image/bin/keytool
+install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+
 # Find JRE directories.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
-  | sed 's|'$RPM_BUILD_ROOT'|%dir |' > %{name}-%{version}-all.files
+  | grep -v jre/lib/security \
+  | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
+  > %{name}-%{version}.files
 # Find JRE files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
-  | sed 's|'$RPM_BUILD_ROOT'||' >> %{name}-%{version}-all.files
+  | grep -v jre/lib/security \
+  | sed 's|'$RPM_BUILD_ROOT'||' \
+  >> %{name}-%{version}.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
+  $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample -type d \
+  | sed 's|'$RPM_BUILD_ROOT'|%dir |' \
+  > %{name}-%{version}-demo.files
 # Find non-documentation demo files.
 find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/demo \
   $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/sample \
@@ -308,17 +354,21 @@
   | sed 's|'$RPM_BUILD_ROOT'||' \
   | sed 's|^|%doc |' \
   >> %{name}-%{version}-demo.files
-# Exclude directory owned by demo subpackage.
-cat %{name}-%{version}-all.files \
-  | grep -v jre/lib/security \
-  | grep -v '/demo' \
-  | grep -v sample \
-  > %{name}-%{version}.files
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+if test -f /proc/sys/fs/binfmt_misc/jarexec
+then
+  echo '-1' > /proc/sys/fs/binfmt_misc/jarexec
+fi
+if test -f /proc/sys/fs/binfmt_misc/register
+then
+  echo ':jarexec:M::PK\x03\x04::%{_jvmdir}/%{jredir}/lib/jexec:' \
+    > /proc/sys/fs/binfmt_misc/register
+fi
+
 ext=
 [ -f %{_mandir}/man1/java-%{name}.1.bz2 ] && ext=".bz2"
 [ -f %{_mandir}/man1/java-%{name}.1.gz ] && ext=".gz"
@@ -369,7 +419,7 @@
   --slave %{_jvmjardir}/jre-%{javaver} \
   jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
 
-update-alternatives \
+alternatives \
   --install \
   %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
   %{localpolicy} \
@@ -383,10 +433,15 @@
 %postun
 if [ $1 -eq 0 ]
 then
+  if test -f /proc/sys/fs/binfmt_misc/jarexec
+  then
+    echo '-1' > /proc/sys/fs/binfmt_misc/jarexec
+  fi
+
   alternatives --remove java %{jrebindir}/java
   alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
   alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
-  update-alternatives --remove \
+  alternatives --remove \
     %{localpolicy} \
     %{_jvmprivdir}/%{archname}/jce/vanilla/local_policy.jar
 fi
@@ -479,6 +534,16 @@
   alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
 fi
 
+%post javadoc
+alternatives \
+  --install %{_javadocdir}/java javadoc %{_javadocdir}/%{name}/api %{priority}
+
+%postun javadoc
+if [ $1 -eq 0 ]
+then
+  alternatives --remove javadoc %{_javadocdir}/%{name}/api
+fi
+
 %files -f %{name}-%{version}.files
 %defattr(-,root,root,-)
 %doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
@@ -560,7 +625,29 @@
 %defattr(-,root,root,-)
 %{_jvmdir}/%{sdkdir}/src.zip
 
+%files javadoc
+%defattr(-,root,root,-)
+%doc %{_javadocdir}/%{name}-%{version}
+%doc %{_javadocdir}/%{name}
+
 %changelog
+* Wed Jul  4 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.4.b14
+- Include generate-cacerts.pl.
+- Generate and install cacerts file.
+
+* Tue Jul  3 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.4.b14
+- Add javadoc subpackage.
+- Add Java Access Bridge for GNOME.
+- Add support for executable JAR files.
+- Bump alternatives priority to 17000.
+
+* Thu Jun 28 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.4.b14
+- Add support for executable jar files.
+- Bump icedteaver.
+- Bump openjdkver.
+- Bump openjdkdate.
+- Bump release number.
+
 * Tue Jun 19 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.3.b13
 - Import IcedTea 1.1.
 - Bump icedteaver.