Regenerate.

1 files changed, 13 insertions, 10 deletions

diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
index 0dace2e994..a8efdb369a 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -50,15 +50,15 @@
 %define gcc_version 4.4.2
 %define gcc_rpmvers %{expand:%(echo "4.4.2" | tr - _ )}
 
-%define newlib_pkgvers		1.17.0
-%define newlib_version		1.17.0
+%define newlib_pkgvers		1.18.0
+%define newlib_version		1.18.0
 
 Name:         	rtems-4.10-powerpc-rtems4.10-gcc
 Summary:      	powerpc-rtems4.10 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	7%{?dist}
+Release:      	9%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -97,7 +97,6 @@ BuildRequires:  %{_host_rpmprefix}gmp-devel >= %{_gmp_minvers}
 
 %if %{defined _mpfr_minvers}
 # FIXME: This is an ugly cludge
-%{?fc10:%global mpfr_provided 2.3.2}
 %{?fc11:%global mpfr_provided 2.4.1}
 %{?fc12:%global mpfr_provided 2.4.1}
 %{?suse11_0:%global mpfr_provided 2.3.1}
@@ -137,7 +136,7 @@ BuildRequires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-gcc-common
 Requires:	rtems-4.10-powerpc-rtems4.10-binutils
 Requires:	rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-65%{?dist}
+Requires:	rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-1%{?dist}
 
 
 %define _gcclibdir %{_prefix}/lib
@@ -157,6 +156,10 @@ Source1:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve
 Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
 Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.17.0-rtems4.10-20091104.diff
 %endif
+%if "%{newlib_version}" == "1.18.0"
+Source50:	ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_pkgvers}.tar.gz
+Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/newlib-1.18.0-rtems4.10-20091218.diff
+%endif
 %{?_without_sources:NoSource:	50}
 
 %if "%{gcc_version}" >= "4.3.0"
@@ -193,7 +196,7 @@ cd ..
   ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-7%{?dist}\/newlib-%{newlib_version}-65%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-9%{?dist}/newlib-%{newlib_version}-1%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -452,7 +455,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       rtems-4.10-powerpc-rtems4.10-binutils
-# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-65%{?dist}
+# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-1%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -470,7 +473,7 @@ Summary:        libgcc for powerpc-rtems4.10-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-65%{?dist}
+Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-1%{?dist}
 License:	GPL
 
 %description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
@@ -645,7 +648,7 @@ Summary:      	C Library (newlib) for powerpc-rtems4.10
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        65%{?dist}
+Release:        1%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.10-newlib-common
@@ -666,7 +669,7 @@ Newlib C Library for powerpc-rtems4.10.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        65%{?dist}
+Release:        1%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable