rpms/java-1.4.2-gcj-compat/FC-4 java-gcj-compat-FC4.patch, NONE, 1.1 java-1.4.2-gcj-compat.spec, 1.69, 1.70

[fedora-cvs-commits redhat com]

Author: gbenson

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Added Files:
	java-gcj-compat-FC4.patch 
Log Message:
Work equally well with old and new libgcj and/or eclipse-ecj

java-gcj-compat-FC4.patch:
 com/sun/tools/javac/Main.java |    2 ++
 rebuild-gcj-db.in             |    6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE java-gcj-compat-FC4.patch ---
A couple of things will move between the versions of libgcj and
eclipse-ecj in the original release of FC4 and the versions that
will shortly be issued as updates.  This patch allows us to work
equally well with either the old or the new versions.

--- com/sun/tools/javac/Main.java~	2005-07-14 17:28:37 +0100
+++ com/sun/tools/javac/Main.java	2005-07-15 15:47:26 +0100
@@ -58,6 +58,8 @@
       {
 	File jar = new File (Config.JAR_INST_DIR + "/eclipse-ecj.jar");
 	if (!jar.exists () || !jar.canRead ())
+	  jar = new File (Config.JAR_INST_DIR + "/jdtcore.jar");
+	if (!jar.exists () || !jar.canRead ())	
 	  throw e;
 
 	ClassLoader loader = new URLClassLoader(new URL[] {jar.toURL ()});
--- rebuild-gcj-db.in~	2005-07-06 18:13:25 +0100
+++ rebuild-gcj-db.in	2005-07-15 15:34:48 +0100
@@ -16,5 +16,9 @@
 dbLocation=` GCJ_BIN_DIR@/gcj-dbtool gcc_suffix@ -p @LIBDIR `
 dirname $dbLocation | xargs mkdir -p
 @GCJ_BIN_DIR@/gcj-dbtool gcc_suffix@ -n $dbLocation 64
-find $dbLocation.d @LIBDIR@/gcj -name '*.db' -print0 | \
+locations="$dbLocation.d @LIBDIR@/gcj"
+if [ -d @LIBDIR@/gcj-4.0.0/classmap.db.d ]; then
+    locations="$locations @LIBDIR@/gcj-4.0.0/classmap.db.d"
+fi
+find $locations -name '*.db' -print0 | \
     xargs -0 @GCJ_BIN_DIR@/gcj-dbtool gcc_suffix@ -m $dbLocation $dbLocation


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-4/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- java-1.4.2-gcj-compat.spec	15 Jul 2005 14:13:03 -0000	1.69
+++ java-1.4.2-gcj-compat.spec	15 Jul 2005 15:15:29 -0000	1.70
@@ -14,7 +14,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release		40jpp_31rh
+%define release		40jpp_31rh.FC4.1
 %define cname           java-%{javaver}-%{origin}
 #%define bcarchivever	127
 
@@ -37,6 +37,7 @@
 URL:		ftp://sources.redhat.com/pub/rhug/java-gcj-compat
 Source0:        java-gcj-compat-%{jgcver}.tar.gz
 #Source1:        bcprov-jdk14-%{bcarchivever}.tar.gz
+Patch1:         java-gcj-compat-FC4.patch
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
@@ -101,6 +102,7 @@
 
 %prep
 %setup -q -n java-gcj-compat-%{jgcver}
+%patch1 -p0 -b .orig
 
 %build
 %if %{custom}
@@ -409,11 +411,12 @@
 %defattr(-,root,root)
 
 %changelog
-* Fri Jul 15 2005 Gary Benson <gbenson redhat com>
+* Fri Jul 15 2005 Gary Benson <gbenson redhat com> 0:1.4.2.0-40jpp_31rh.FC4.1
 - Import java-gcj-compat 1.0.33.
 - Add virtual dependencies to indicate our upstream version.
 - Add python dependency for aot-compile-rpm.
 - Move the aot-compile scripts to the devel subpackage.
+- Work equally well with old and new libgcj and/or eclipse-ecj.
 
 * Mon Jun  6 2005 Thomas Fitzsimmons <fitzsim redhat com> 0:1.4.2.0-40jpp_31rh
 - Add jaxp_parser_impl.jar alternative. (#158751)