--- a/java-1.7.0-icedtea.spec	Mon Aug 27 15:30:03 2007 -0400
+++ b/java-1.7.0-icedtea.spec	Mon Aug 27 15:36:07 2007 -0400
@@ -5,12 +5,12 @@
 %define gcjbootstrap 1
 
 %define icedteaver 1.3
-%define icedteasnapshot -200060a622000dd98da0ad0c3f4d1e5d49e350bc
+%define icedteasnapshot -0ff3dc1b992a62822f246feac067ba5433cca1b7
 %define icedtearelease snapshot
 %define openjdkver b18
 %define openjdkdate 16_aug_2007
 
-%define genurl http://icedtea.classpath.org/hg/fedora/raw-file/d30f0842b5c3/
+%define genurl http://icedtea.classpath.org/hg/fedora/file/1b44a134cf15/
 
 %define accessmajorver 1.19
 %define accessminorver 2
@@ -20,6 +20,7 @@
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
+%define newopenjdkzip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
 
 %ifarch x86_64
 %define archbuild amd64
@@ -103,6 +104,9 @@
 NoSource: 1
 Source2:  %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz
 Source3:  %{genurl}generate-cacerts.pl
+Source4:  %{genurl}modzip.sh
+Source5:  %{newopenjdkzip}
+Source6:  %{genurl}patches
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -250,9 +254,16 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 gzip -dc %{SOURCE2} | tar -xf -
+# modzip script removes all jhat and idlj source files that have
+# questionable license headers. The openjdk sources are re-zipped
+# with a new name (see newopenjdkzip) and used to build IcedTea.
+%{SOURCE4} %{SOURCE1}
 
 %build
-./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
+# We don't want to download the zip from OpenJDK. Therefore, we 
+# needed to patch out md5sum check from Makefile in IcedTea.
+patch -p0 < %{SOURCE6}/Makefile.patch
+./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE5}
 make
 pushd java-access-bridge-%{accessver}
   export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -695,6 +706,13 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Aug 27 2007 Lillian Angel <langel@redhat.com> - 1.7.0.0-0.13.b18.snapshot
+- Added line to run modzip.sh to remove specific files from the openjdk zip.
+- Defined new openjdk zip created by modzip.sh as newopenjdkzip.
+- Added line to patch the IcedTea Makefile. No need to download openjdk zip.
+- Updated genurl.
+- Updated icedteasnapshot.
+
 * 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.