rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.46, 1.47 java-1.4.2-gcj-compat.spec, 1.121, 1.122 sources, 1.50, 1.51
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Feb 2 19:28:54 UTC 2006
Author: fitzsim
Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17610
Modified Files:
.cvsignore java-1.4.2-gcj-compat.spec sources
Log Message:
* Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
- Import BouncyCastle 1.3.1.
- Re-enable BouncyCastle provider.
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore 25 Jan 2006 19:01:53 -0000 1.46
+++ .cvsignore 2 Feb 2006 19:28:51 -0000 1.47
@@ -1,3 +1,3 @@
-bcprov-jdk14-127.tar.gz
+bcprov-jdk14-131.tar.gz
eclipse-ecj-3.1.0_fc-12.jar
java-gcj-compat-1.0.52.tar.gz
Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- java-1.4.2-gcj-compat.spec 25 Jan 2006 19:02:07 -0000 1.121
+++ java-1.4.2-gcj-compat.spec 2 Feb 2006 19:28:51 -0000 1.122
@@ -21,9 +21,9 @@
%define name java-%{javaver}-%{origin}-compat
%define version %{javaver}.%{buildver}
-%define release 40jpp_63rh
+%define release 40jpp_64rh
%define cname java-%{javaver}-%{origin}
-#%define bcarchivever 127
+%define bcarchivever 131
%define sdklnk java-%{javaver}-%{origin}
%define jrelnk jre-%{javaver}-%{origin}
@@ -43,13 +43,13 @@
License: GPL
URL: ftp://sources.redhat.com/pub/rhug/java-gcj-compat
Source0: java-gcj-compat-%{jgcver}.tar.gz
-#Source1: bcprov-jdk14-%{bcarchivever}.tar.gz
+Source1: bcprov-jdk14-%{bcarchivever}.tar.gz
Source2: eclipse-ecj-3.1.0_fc-12.jar
Source3: ecj.sh.in
BuildRoot: %{_tmppath}/%{name}-buildroot
BuildRequires: jpackage-utils >= 0:1.5, sed
BuildRequires: gcc%{gccsuffix}-java >= %{gccver}
-#BuildRequires: eclipse-ecj
+BuildRequires: eclipse-ecj
Requires: libgcj%{gccsuffix} >= %{gccver}
Requires: gjdoc
Requires: jessie >= 1.0.0-5
@@ -131,16 +131,16 @@
--with-security-directory=%{_sysconfdir}/java/security/security.d
make
-# gzip -dc %{SOURCE1} | tar -xf -
-# # build bouncy castle provider
-# pushd bcprov-jdk14-%{bcarchivever}/src
-# find -type d -name test | xargs rm -rf
-# ecj `find . -type f -name "*.java"`
-# jar2="bcprov-%{bcarchivever}.jar"
-# files="`find . -type f -name "*.class"`"
-# test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-# test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
-# popd
+gzip -dc %{SOURCE1} | tar -xf -
+# build bouncy castle provider
+pushd bcprov-jdk14-%{bcarchivever}/src
+ find -type d -name test | xargs rm -rf
+ ecj `find . -type f -name "*.java"`
+ jar2="bcprov-%{bcarchivever}.jar"
+ files="`find . -type f -name "*.class"`"
+ test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
+ test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
+popd
%if %{custom}
cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
@@ -205,7 +205,7 @@
%if ! %{custom}
touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
%endif
-# touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+touch $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
# versionless symlinks
pushd $RPM_BUILD_ROOT%{_jvmdir}
@@ -230,10 +230,10 @@
find $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin -type f -o -type l \
| sed "s|^$RPM_BUILD_ROOT||" > %{name}-%{version}-sdk-bin.files
-# # install bouncy castle provider
-# install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
-# install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
-# $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+# install bouncy castle provider
+install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
+install -pm 644 bcprov-jdk14-%{bcarchivever}/src/bcprov-%{bcarchivever}.jar \
+ $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
# classmap database directory
install -dm 755 $RPM_BUILD_ROOT%{_libdir}/gcj
@@ -513,12 +513,12 @@
%{jvmjardir}/*.jar
%{_jvmdir}/%{jrelnk}
%{_jvmjardir}/%{jrelnk}
-#%{_jvmprivdir}/*
+# %{_jvmprivdir}/*
%if ! %{custom}
%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
%endif
-# %{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
-# %{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
+%{_javadir}/gcj-endorsed/bcprov-%{bcarchivever}.jar
+%{_sysconfdir}/java/security/security.d/2000-org.bouncycastle.jce.provider.BouncyCastleProvider
%files devel -f %{name}-%{version}-sdk-bin.files
%defattr(-,root,root)
@@ -547,6 +547,10 @@
%defattr(-,root,root)
%changelog
+* Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
+- Import BouncyCastle 1.3.1.
+- Re-enable BouncyCastle provider.
+
* Wed Jan 25 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_63rh
- Import java-gcj-compat 1.0.52.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 25 Jan 2006 19:02:08 -0000 1.50
+++ sources 2 Feb 2006 19:28:51 -0000 1.51
@@ -1,3 +1,3 @@
-d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz
+830237b359ad7245ec67a972e58ac098 bcprov-jdk14-131.tar.gz
95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar
40635fcbe7183ce72fdd45b8a3fc373e java-gcj-compat-1.0.52.tar.gz
More information about the fedora-cvs-commits
mailing list