|
|
Author: fitzsim
Update of /cvs/dist/rpms/java-1.5.0-gcj/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20634
Modified Files:
java-1.5.0-gcj.spec
Log Message:
* Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim@xxxxxxxxxx> - 1.5.0.0-13
- Point URL field at java-gcj-compat home page.
- Require openssl for build.
- Generate and include cacerts.
- Resolves: rhbz#200836 rhbz#233239
Index: java-1.5.0-gcj.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.5.0-gcj/devel/java-1.5.0-gcj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- java-1.5.0-gcj.spec 3 Apr 2007 20:53:07 -0000 1.13
+++ java-1.5.0-gcj.spec 10 Apr 2007 18:33:15 -0000 1.14
@@ -55,13 +55,14 @@
Name: %{name}
Version: %{javaver}.%{buildver}
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: JPackage runtime compatibility layer for GCJ
Group: Development/Languages
License: GPL
-URL: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
-Source0: java-gcj-compat-%{jgcver}.tar.gz
+URL: http://sources.redhat.com/rhug/java-gcj-compat.html
+Source0: ftp://sources.redhat.com/pub/rhug/java-gcj-compat-%{jgcver}.tar.gz
+Source1: generate-cacerts.pl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -69,6 +70,8 @@
# and rebuild-gcj-db
BuildRequires: gcc%{gccsuffix}-java >= %{gccver}
BuildRequires: libgcj%{gccsuffix}-src >= %{gccver}
+# required for cacerts generation
+BuildRequires: openssl
BuildRequires: python-devel
%if ! %{bootstrap}
BuildRequires: sinjdoc
@@ -314,6 +317,10 @@
# classpath.security file.
EOF
done
+# cacerts
+pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
+ %{__perl} %{SOURCE1}
+popd
# versionless symbolic links
pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -593,6 +600,7 @@
%{_jvmdir}/%{jredir}/bin/java
%{_jvmdir}/%{jredir}/bin/keytool
%{_jvmdir}/%{jredir}/bin/rmiregistry
+%{_jvmdir}/%{jredir}/lib/security/cacerts
%{_jvmdir}/%{jredir}/lib/security/java.security
%{_jvmdir}/%{jredir}/lib/jaas.jar
%{_jvmdir}/%{jredir}/lib/jce.jar
@@ -706,6 +714,12 @@
%endif
%changelog
+* Tue Apr 10 2007 Thomas Fitzsimmons <fitzsim@xxxxxxxxxx> - 1.5.0.0-13
+- Point URL field at java-gcj-compat home page.
+- Require openssl for build.
+- Generate and include cacerts.
+- Resolves: rhbz#200836 rhbz#233239
+
* Tue Apr 3 2007 Thomas Fitzsimmons <fitzsim@xxxxxxxxxx> - 1.5.0.0-12
- Obsolete gnu-crypto, gnu-crypto-sasl-jdk1.4 and jessie in base
package.
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|