rpms/java-1.6.0-openjdk/F-9 .cvsignore, 1.25, 1.26 java-1.6.0-openjdk.spec, 1.37, 1.38 sources, 1.24, 1.25
Thomas Fitzsimmons (fitzsim)
fedora-extras-commits at redhat.com
Wed May 28 06:31:19 UTC 2008
- Previous message (by thread): rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.6, 1.7 xorg-x11-drv-ati.spec, 1.97, 1.98
- Next message (by thread): rpms/cairo-dock/F-8 .cvsignore, 1.3, 1.4 cairo-dock.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: fitzsim
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29231
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/F-9/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 26 May 2008 16:13:07 -0000 1.25
+++ .cvsignore 28 May 2008 06:30:29 -0000 1.26
@@ -2,4 +2,4 @@
java-access-bridge-1.22.0.tar.gz
mauve-2008-03-11.tar.gz
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/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- java-1.6.0-openjdk.spec 26 May 2008 16:13:07 -0000 1.37
+++ java-1.6.0-openjdk.spec 28 May 2008 06:30:29 -0000 1.38
@@ -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
@@ -111,7 +111,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.14.%{openjdkver}%{?dist}
+Release: 0.15.%{openjdkver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -195,9 +195,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.
@@ -396,6 +395,13 @@
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}
@@ -774,8 +780,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
@@ -861,6 +867,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.14.b09
- Added eclipse-ecj build requirement for mauve.
- Updated icedteasnapshot.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 26 May 2008 16:13:07 -0000 1.24
+++ sources 28 May 2008 06:30:29 -0000 1.25
@@ -2,4 +2,4 @@
11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
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
- Previous message (by thread): rpms/xorg-x11-drv-ati/F-9 radeon-git-upstream-fixes2.patch, 1.6, 1.7 xorg-x11-drv-ati.spec, 1.97, 1.98
- Next message (by thread): rpms/cairo-dock/F-8 .cvsignore, 1.3, 1.4 cairo-dock.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list