# HG changeset patch
# User Thomas Fitzsimmons  <fitzsim@redhat.com>
# Date 1187896922 14400
# Node ID 7e115d272e211779bcfc2664681444df4d3e755b
# Parent  d30f0842b5c39de6494d25bb1aead0e4c9a5b586
* 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.
- Fix plugin post alternatives invocation.
- Include IcedTea documentation.

diff -r d30f0842b5c3 -r 7e115d272e21 java-1.7.0-icedtea.spec
--- a/java-1.7.0-icedtea.spec	Tue Aug 21 05:59:04 2007 -0400
+++ b/java-1.7.0-icedtea.spec	Thu Aug 23 15:22:02 2007 -0400
@@ -10,7 +10,10 @@
 %define openjdkver b18
 %define openjdkdate 16_aug_2007
 
+%define genurl http://icedtea.classpath.org/hg/fedora/raw-file/d30f0842b5c3/
+
 %define accessver 1.19.2
+%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
 
 %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
@@ -86,7 +89,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.11.%{openjdkver}.%{icedtearelease}%{?dist}
+Release: 0.12.%{openjdkver}.%{icedtearelease}%{?dist}
 Summary: IcedTea Runtime Environment
 Group:   Development/Languages
 
@@ -94,11 +97,10 @@
 URL:      http://icedtea.classpath.org/
 Source0:  %{url}download/source/icedtea-%{icedteaver}%{icedteasnapshot}.tar.gz
 Source1:  %{openjdkurl}%{openjdkzip}
-# Some questionable license headers prevent us from distributing the
-# OpenJDK zip file in a .src.rpm.
+# Save icedtea.classpath.org space and bandwidth.
 NoSource: 1
-Source2:  java-access-bridge-%{accessver}.tar.gz
-Source3:  generate-cacerts.pl
+Source2:  %{accessurl}java-access-bridge-%{accessver}.tar.gz
+Source3:  %{genurl}generate-cacerts.pl
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -154,10 +156,11 @@
 Provides: jaas = %{version}
 Provides: jsse = %{version}
 Provides: jce = %{version}
-# Both these versioned provides need to be here.  Requiring the first
-# one means requiring a version of the JDBC API; requiring the second
-# one means requiring the JDBC API provided by a 1.5-level JVM.  This
-# convention comes from JPackage.
+# Both these versioned provides need to be here since either may be
+# required explicitly.  Requiring the first one means requiring a
+# version of the JDBC API; requiring the second one means requiring
+# the JDBC API provided by this version of the JDK.  This convention
+# comes from JPackage.
 Provides: jdbc-stdext = 3.0
 Provides: jdbc-stdext = %{version}
 Provides: java-sasl = %{version}
@@ -165,9 +168,7 @@
 ExclusiveArch: i586 x86_64
 
 %description
-The IcedTea runtime environment.  IcedTea is based on code from the
-OpenJDK project.  OpenJDK is a trademark or registered trademark of
-Sun Microsystems, Inc. in the U.S. or other countries.
+The IcedTea runtime environment.
 
 %package devel
 Summary: IcedTea Development Environment
@@ -239,7 +240,7 @@
 %endif
 
 %package plugin
-Summary: IcedTea Plugin
+Summary: IcedTea Web Browser Plugin
 Group:   Applications/Internet
 
 Requires: %{name} = %{version}-%{release}
@@ -611,7 +612,7 @@
 %post plugin
 alternatives \
   --install %{_libdir}/mozilla/plugins/libjavaplugin.so libjavaplugin.so \
-  %{priority} %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so
+  %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority}
 
 %postun plugin
 if [ $1 -eq 0 ]
@@ -626,6 +627,11 @@
 %doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
 %doc %{buildoutputdir}/j2sdk-image/jre/README.html
 %doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
+%doc AUTHORS
+%doc COPYING
+%doc ChangeLog
+%doc NEWS
+%doc README
 %dir %{_jvmdir}/%{sdkdir}
 %{_jvmdir}/%{jrelnk}
 %{_jvmjardir}/%{jrelnk}
@@ -713,6 +719,12 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* 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.
+- Fix plugin post alternatives invocation.
+- Include IcedTea documentation.
+
 * Tue Aug 21 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.11.b18.snapshot
 - Revert change to configure macro.