2003-09-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* gcc3newlib/gccnewlib.add: Fix duplicate removal of c++filt.
	* gcc3newlib/base-gcj.add: Add fastjar.info, jar.1, grepjar.1.
	* setup.def: gcc3newlib_rpm_release=4.

scripts/ChangeLog

@@ -1,3 +1,9 @@
+2003-09-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* gcc3newlib/gccnewlib.add: Fix duplicate removal of c++filt.
+	* gcc3newlib/base-gcj.add: Add fastjar.info, jar.1, grepjar.1.
+	* setup.def: gcc3newlib_rpm_release=4.
+
 2003-09-04	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* binutils/base-binutils.add: Add osversion support.

scripts/gcc3newlib/base-gcj.add

@@ -20,7 +20,9 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 
 %dir %{_prefix}/info
 %doc %{_prefix}/info/gcj.info*.gz
-
+%if "%{gcc_version}" >= "3.3"
+%doc %{_prefix}/info/fastjar.info*gz
+%endif
 %dir %{_prefix}/man/man1
 %doc %{_prefix}/man/man1/gcjh.1*
 %doc %{_prefix}/man/man1/jv-scan.1*
@@ -29,5 +31,9 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %doc %{_prefix}/man/man1/jv-convert.1*
 %doc %{_prefix}/man/man1/rmic.1*
 %doc %{_prefix}/man/man1/rmiregistry.1*
+%if "%{gcc_version}" >= "3.3"
+%doc %{_prefix}/man/man1/jar.1*
+%doc %{_prefix}/man/man1/grepjar.1*
+%endif
 
 %endif

scripts/gcc3newlib/gccnewlib.add

@@ -199,8 +199,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
 %endif
 
-  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
-
 %if %build_gnat
   cd ../gcc-%{gcc_version}/gcc/ada
   touch treeprs.ads [es]info.h nmake.ad[bs]
@@ -265,10 +263,8 @@ This is gcc's and newlib C Library's sources with patches for RTEMS.
   # host library
   rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
 
-%if "%{gcc_version}" < "3.3"
   # We use the version from binutils
   rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext}
-%endif
 
 %if "%{gcc_version}" < "3.0"
   # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.

scripts/setup.def

@@ -21,4 +21,4 @@ gcc3newlib_version=1.11.0
 gcc3newlib_patch_version=20030507
 gcc3_version=3.2.3
 gcc3_patch_version=20030507a
-gcc3newlib_rpm_release=3
+gcc3newlib_rpm_release=4