From 080629bad7d9315324a8707e2eb91efda9eb8d3c Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Wed, 12 Dec 2007 23:29:33 +0000
Subject: [PATCH] 4.3.0-0.2

---
 gcc43-libjava-gcjpath.patch | 30 ++++++++++++++++++++++++++++++
 gcc43.spec                  |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 gcc43-libjava-gcjpath.patch

diff --git a/gcc43-libjava-gcjpath.patch b/gcc43-libjava-gcjpath.patch
new file mode 100644
index 0000000..461cc4b
--- /dev/null
+++ b/gcc43-libjava-gcjpath.patch
@@ -0,0 +1,30 @@
+--- libjava/classpath/configure.ac	(revision 130691)
++++ libjava/classpath/configure.ac	(working copy)
+@@ -294,14 +294,14 @@ CLASSPATH_TOOLEXECLIBDIR
+ dnl -----------------------------------------------------------
+ dnl Sets the native libraries installation dir
+ dnl -----------------------------------------------------------
+-dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}-${libgcj_soversion}
++dnl GCJ LOCAL: default to ${toolexeclibdir}/gcj-${gcc_version}
+ AC_ARG_WITH([native-libdir],
+ 	    [AS_HELP_STRING(--with-native-libdir,sets the installation directory for native libraries [default='${libdir}/${PACKAGE}'])],
+ 	    [
+ 	     nativeexeclibdir=${withval}
+ 	    ],
+ 	    [
+-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[[^#]].*:/ { print $1 }' ${srcdir}/../libtool-version`
++	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
+ 	    ])
+ 
+ AC_SUBST(nativeexeclibdir)
+--- libjava/classpath/configure	(revision 130691)
++++ libjava/classpath/configure	(working copy)
+@@ -4771,7 +4771,7 @@ if test "${with_native_libdir+set}" = se
+ 
+ else
+ 
+-	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`-`awk -F: '/^[^#].*:/ { print $1 }' ${srcdir}/../libtool-version`
++	     nativeexeclibdir='${toolexeclibdir}/gcj-'`cat ${srcdir}/../../gcc/BASE-VER`
+ 
+ fi;
+ 
diff --git a/gcc43.spec b/gcc43.spec
index 52548a6..1ff62d1 100644
--- a/gcc43.spec
+++ b/gcc43.spec
@@ -139,6 +139,7 @@ Patch11: gcc43-rh330771.patch
 Patch12: gcc43-rh341221.patch
 Patch13: gcc43-libjava-test.patch
 Patch14: gcc43-pr34427.patch
+Patch15: gcc43-libjava-gcjpath.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -436,6 +437,7 @@ which are required to run programs compiled with the GNAT.
 %patch12 -p0 -b .rh341221~
 %patch13 -p0 -b .libjava-test~
 %patch14 -p0 -E -b .pr34427~
+%patch15 -p0 -b .libjava-gcjpath~
 
 %if %{bootstrap_java}
 tar xjf %{SOURCE10}