rpms/java-1.6.0-openjdk/devel .cvsignore, 1.26, 1.27 java-1.6.0-openjdk.spec, 1.39, 1.40 sources, 1.25, 1.26

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31065

Modified Files:
	.cvsignore java-1.6.0-openjdk.spec sources 
Log Message:
* Tue May 27 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
- Require ca-certificates.
- Symlink to ca-certificates cacerts.
- Remove cacerts from files list.
- Resolves: rhbz#444260




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 May 2008 16:14:46 -0000	1.26
+++ .cvsignore	28 May 2008 14:18:11 -0000	1.27
@@ -2,4 +2,4 @@
 mauve-2008-03-11.tar.gz
 mauve_tests
 openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
-icedtea6-1.2-8d050f3a935c1e15d576bbbbd4f7d99120ca83be.tar.gz
+icedtea6-1.2-a4f2994ff2c4e13cedcf693e29029ba87a898bbd.tar.gz


Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- java-1.6.0-openjdk.spec	26 May 2008 16:14:46 -0000	1.39
+++ java-1.6.0-openjdk.spec	28 May 2008 14:18:11 -0000	1.40
@@ -4,7 +4,7 @@
 %define gcjbootstrap 0
 
 %define icedteaver 1.2
-%define icedteasnapshot -8d050f3a935c1e15d576bbbbd4f7d99120ca83be
+%define icedteasnapshot -a4f2994ff2c4e13cedcf693e29029ba87a898bbd
 %define openjdkver b09
 %define openjdkdate 11_apr_2008
 
@@ -200,9 +200,8 @@
 %endif
 
 Requires: libjpeg = 6b
-# Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
-# cacerts.
-Requires: openssl
+# 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.
@@ -403,6 +402,14 @@
   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}
@@ -781,8 +788,8 @@
 %{_jvmprivdir}/*
 %{jvmjardir}
 %dir %{_jvmdir}/%{jredir}/lib/security
+%{_jvmdir}/%{jredir}/lib/security/cacerts
 #FIXME: These should be replaced by symlinks into /etc.
-%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/cacerts
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
@@ -868,6 +875,12 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Tue May 27 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
+- Require ca-certificates.
+- Symlink to ca-certificates cacerts.
+- Remove cacerts from files list.
+- Resolves: rhbz#444260
+
 * Mon May 26 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.15.b09
 - Added eclipse-ecj build requirement for mauve.
 - Updated icedteasnapshot.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	26 May 2008 16:14:46 -0000	1.25
+++ sources	28 May 2008 14:18:11 -0000	1.26
@@ -2,4 +2,4 @@
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 77f6e5b946c9c28c208b70cde372479f  openjdk-6-src-b09-11_apr_2008-fedora.tar.gz
-809bd3c1644d89b7ba8a9519f767df4a  icedtea6-1.2-8d050f3a935c1e15d576bbbbd4f7d99120ca83be.tar.gz
+e49cab5ad9422bbf88483e75ec8e9395  icedtea6-1.2-a4f2994ff2c4e13cedcf693e29029ba87a898bbd.tar.gz