1.1 --- a/gcc/gcc.spec Sun Apr 03 13:34:55 2011 +0200
1.2 +++ b/gcc/gcc.spec Sun Apr 03 15:43:53 2011 +0200
1.3 @@ -36,7 +36,7 @@
1.4 Group: Compiler
1.5 License: GPL
1.6 Version: %{V_full}
1.7 -Release: 20110331
1.8 +Release: 20110332
1.9
1.10 # package options
1.11 %option with_binutils yes
1.12 @@ -144,6 +144,7 @@
1.13 libjava/configure
1.14 %{l_shtool} subst \
1.15 -e 's;JAR *= *@JAR@;JAR = $(here)/scripts/jar;' \
1.16 + -e 's;\(jardir *= *\$(datadir)\)/java;\1/gcc/java;' \
1.17 libjava/Makefile.in
1.18 %endif
1.19 if [ ".%{V_comp}" != . ]; then
1.20 @@ -421,10 +422,14 @@
1.21 rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la >/dev/null 2>&1 || true
1.22 rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib64 >/dev/null 2>&1 || true
1.23 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc* >/dev/null 2>&1 || true
1.24 + rmdir $RPM_BUILD_ROOT%{l_prefix}/include/gcc* >/dev/null 2>&1 || true
1.25 %if "%{with_cxx}" == "yes"
1.26 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++ >/dev/null 2>&1 || true
1.27 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++ >/dev/null 2>&1 || true
1.28 %endif
1.29 +%if "%{with_java}" == "yes"
1.30 + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcj >/dev/null 2>&1 || true
1.31 +%endif
1.32 strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
1.33 for prog in cc1 cc1plus collect2 cpp; do
1.34 strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/${prog} \
