diff -r f71e028eb3e2 -r 1153ac6bac7e gcc/gcc.spec
--- a/gcc/gcc.spec	Sun Apr 03 13:34:55 2011 +0200
+++ b/gcc/gcc.spec	Sun Apr 03 15:43:53 2011 +0200
@@ -36,7 +36,7 @@
 Group:        Compiler
 License:      GPL
 Version:      %{V_full}
-Release:      20110331
+Release:      20110332
 
 #   package options
 %option       with_binutils  yes
@@ -144,6 +144,7 @@
         libjava/configure
     %{l_shtool} subst \
         -e 's;JAR *= *@JAR@;JAR = $(here)/scripts/jar;' \
+        -e 's;\(jardir *= *\$(datadir)\)/java;\1/gcc/java;' \
         libjava/Makefile.in
 %endif
     if [ ".%{V_comp}" != . ]; then
@@ -421,10 +422,14 @@
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/*.la   >/dev/null 2>&1 || true
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib64      >/dev/null 2>&1 || true
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc* >/dev/null 2>&1 || true
+    rmdir  $RPM_BUILD_ROOT%{l_prefix}/include/gcc* >/dev/null 2>&1 || true
 %if "%{with_cxx}" == "yes"
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++  >/dev/null 2>&1 || true
     rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++  >/dev/null 2>&1 || true
 %endif
+%if "%{with_java}" == "yes"
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcj  >/dev/null 2>&1 || true
+%endif
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
     for prog in cc1 cc1plus collect2 cpp; do
         strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/${prog} \