rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.45,1.46

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30089

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Sat May 31 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Fix keytool location passed to generate-cacerts.pl.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- java-1.6.0-openjdk.spec	31 May 2008 00:53:06 -0000	1.45
+++ java-1.6.0-openjdk.spec	31 May 2008 15:12:09 -0000	1.46
@@ -349,9 +349,10 @@
 make
 
 # Build cacerts file.
+export KEYTOOL=$(pwd)/%{buildoutputdir}/j2sdk-image/bin/keytool
 pushd %{buildoutputdir}/j2sdk-image/jre/lib/security
   rm -f cacerts
-  %{__perl} %{SOURCE8} $(pwd)/%{buildoutputdir}/j2sdk-image/bin/keytool \
+  %{__perl} %{SOURCE8} $KEYTOOL \
     %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 popd
 
@@ -875,6 +876,9 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Sat May 31 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Fix keytool location passed to generate-cacerts.pl.
+
 * Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
 - Generate cacerts file.