rpms/java-1.6.0-openjdk/F-9 .cvsignore, 1.28, 1.29 java-1.6.0-openjdk.spec, 1.44, 1.45 sources, 1.28, 1.29

[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-serv4710

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Generate cacerts file.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	30 May 2008 22:15:46 -0000	1.28
+++ .cvsignore	31 May 2008 00:53:06 -0000	1.29
@@ -1,3 +1,4 @@
+generate-cacerts.pl
 icedtea6-1.2.tar.gz
 java-access-bridge-1.22.0.tar.gz
 mauve-2008-03-11.tar.gz


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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- java-1.6.0-openjdk.spec	31 May 2008 00:04:17 -0000	1.44
+++ java-1.6.0-openjdk.spec	31 May 2008 00:53:06 -0000	1.45
@@ -135,6 +135,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  generate-cacerts.pl
 # FIXME: This patch needs to be fixed. optflags argument
 # -mtune=generic is being ignored because it breaks several graphical
 # applications.
@@ -188,10 +189,10 @@
 %ifnarch x86_64 %{ix86}
 BuildRequires: libffi-devel
 %endif
+# cacerts build requirement.
+BuildRequires: openssl
 
 Requires: libjpeg = 6b
-# Require /etc/pki/java/cacerts.
-Requires: ca-certificates
 # Require jpackage-utils for ant.
 Requires: jpackage-utils >= 1.7.3-1jpp.3
 # Require zoneinfo data provided by tzdata-java subpackage.
@@ -347,6 +348,13 @@
 make stamps/patch.stamp
 make
 
+# Build cacerts file.
+pushd %{buildoutputdir}/j2sdk-image/jre/lib/security
+  rm -f cacerts
+  %{__perl} %{SOURCE8} $(pwd)/%{buildoutputdir}/j2sdk-image/bin/keytool \
+    %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
+popd
+
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
 
 # Build Java Access Bridge for GNOME.
@@ -397,14 +405,6 @@
   install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
   cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
 
-  # Install cacerts symlink.
-  rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts
-  pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-    RELATIVE=$(%{abs2rel} %{_sysconfdir}/pki/java \
-      %{_jvmdir}/%{jredir}/lib/security)
-    ln -sf $RELATIVE/cacerts .
-  popd
-
   # Install extension symlinks.
   install -d -m 755 $RPM_BUILD_ROOT%{jvmjardir}
   pushd $RPM_BUILD_ROOT%{jvmjardir}
@@ -786,7 +786,7 @@
 %{_jvmprivdir}/*
 %{jvmjardir}
 %dir %{_jvmdir}/%{jredir}/lib/security
-%{_jvmdir}/%{jredir}/lib/security/cacerts
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
 # FIXME: These should be replaced by symlinks into /etc.
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
@@ -876,6 +876,9 @@
 
 %changelog
 * Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Generate cacerts file.
+
+* Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
 - Remove jhat patch.
 
 * Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	30 May 2008 22:42:41 -0000	1.28
+++ sources	31 May 2008 00:53:06 -0000	1.29
@@ -1,3 +1,4 @@
+a6943b08c5752fb0c236ff193f3e0ee5  generate-cacerts.pl
 8bc02e7913fa977cdc6f5c8f081d1a8d  icedtea6-1.2.tar.gz
 11d8e6129f27792cc1b0e1a7de2ec127  java-access-bridge-1.22.0.tar.gz
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz