rpms/java-1.4.2-gcj-compat/FC-4 java-gcj-compat-FC4.patch,1.1,1.2

[fedora-cvs-commits at 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-serv1775

Modified Files:
	java-gcj-compat-FC4.patch 
Log Message:
Don't add the old database directory if it's the one we're using anyway

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

Index: java-gcj-compat-FC4.patch
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-4/java-gcj-compat-FC4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-gcj-compat-FC4.patch	15 Jul 2005 15:15:46 -0000	1.1
+++ java-gcj-compat-FC4.patch	15 Jul 2005 15:46:36 -0000	1.2
@@ -16,14 +16,15 @@
  	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 @@
+@@ -16,5 +16,10 @@
  dbLocation=`@GCJ_BIN_DIR@/gcj-dbtool at gcc_suffix@ -p @LIBDIR@`
  dirname $dbLocation | xargs mkdir -p
  @GCJ_BIN_DIR@/gcj-dbtool at 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"
++oldlocation=@LIBDIR@/gcj-4.0.0/classmap.db.d
++if [ $dbLocation.d != $oldlocation -a -d $oldlocation ]; then
++    locations="$locations $oldlocation"
 +fi
 +find $locations -name '*.db' -print0 | \
      xargs -0 @GCJ_BIN_DIR@/gcj-dbtool at gcc_suffix@ -m $dbLocation $dbLocation