rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.54, 1.55 java-1.4.2-gcj-compat.spec, 1.172, 1.173 sources, 1.60, 1.61

[fedora-cvs-commits at redhat.com]

Author: fitzsim

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14132

Modified Files:
	.cvsignore java-1.4.2-gcj-compat.spec sources 
Log Message:
* Thu Sep  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.108
- Import java-gcj-compat 1.0.68 to eliminate rebuild-gcj-db multilib
  conflict.
- Work around gjdoc/libgcj rounding error in Double.html.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore	31 Aug 2006 19:42:39 -0000	1.54
+++ .cvsignore	7 Sep 2006 22:30:04 -0000	1.55
@@ -1,3 +1,3 @@
-java-gcj-compat-1.0.65.tar.gz
 ecj.sh.in
 eclipse-ecj-3.1.0_fc-12.jar
+java-gcj-compat-1.0.68.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.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- java-1.4.2-gcj-compat.spec	7 Sep 2006 20:37:04 -0000	1.172
+++ java-1.4.2-gcj-compat.spec	7 Sep 2006 22:30:05 -0000	1.173
@@ -11,7 +11,7 @@
 %define buildver	0
 # the version-release string for the gcj rpms we require
 %define gccver		4.0.0-0.42
-%define jgcver		1.0.65
+%define jgcver		1.0.68
 
 %define cname           java-%{javaver}-%{origin}
 
@@ -27,7 +27,7 @@
 
 Name:		java-%{javaver}-%{origin}-compat
 Version:	%{javaver}.%{buildver}
-Release: 	40jpp.107
+Release: 	40jpp.108
 Epoch:		0
 Summary:	JPackage runtime scripts for GCJ
 
@@ -269,6 +269,10 @@
   fi
 popd
 
+# work around apparent gjdoc/libgcj rounding error that causes a
+# multilib conflict in Double.html
+sed -i 's/2.147483647/2.147483648/g' $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/java/lang/Double.html
+
 %ifarch x86_64
 ln -sf %{_jvmdir}/%{jredir}/lib/%{_arch} \
   $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
@@ -654,6 +658,11 @@
 # %defattr(-,root,root)
 
 %changelog
+* Thu Sep  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.108
+- Import java-gcj-compat 1.0.68 to eliminate rebuild-gcj-db multilib
+  conflict.
+- Work around gjdoc/libgcj rounding error in Double.html.
+
 * Thu Sep  7 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp.107
 - Give aotcompile.py a consistent timestamp. (205216)
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	31 Aug 2006 19:42:39 -0000	1.60
+++ sources	7 Sep 2006 22:30:05 -0000	1.61
@@ -1,3 +1,3 @@
-84d12257e981648454dc042639a1936e  java-gcj-compat-1.0.65.tar.gz
 e9c12c59e5a34c5c916d3b032dd7855e  ecj.sh.in
 95766e40c6ab6b641341f3a44dcf0b9e  eclipse-ecj-3.1.0_fc-12.jar
+08b2fa8831e1668f18f30bf4f933556f  java-gcj-compat-1.0.68.tar.gz