Sync with CVS-HEAD.

5 files changed, 8 insertions, 14 deletions

diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
index 3648ee25a6..73ee9e1fd7 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -7,6 +7,7 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
+Release:        @NEWLIB_RPMREL@
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 2341c5a2a2..652844ae09 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -4,8 +4,8 @@
 %define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
 
 %if %build_newlib
+%define newlib_pkgvers		@NEWLIB_PKGVERS@
 %define newlib_version		@NEWLIB_VERS@
-%define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
 %endif
 
 %define mpfr_version	2.3.1
@@ -38,12 +38,11 @@ BuildRequires:  mpfr-devel >= 2.3.0
 %endif
 # These distros ship an insufficient mpfr
 %{?el4:%define 	_build_mpfr 	1}
-%{?suse10_2:%define 	_build_mpfr 	1}
 %{?suse10_3:%define 	_build_mpfr 	1}
 %endif
 
 %if "%{_build}" != "%{_host}"
-BuildRequires:  @rpmprefix@@tool_target@-gcc
+BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
 %endif
 
 %if "%{gcc_version}" >= "4.2.0"
@@ -73,7 +72,7 @@ Requires:	@rpmprefix@@tool_target@-binutils
 Requires:	@rpmprefix@@tool_target@-sys-root
 Requires:	@rpmprefix@@tool_target@-w32api-sys-root
 %if %build_newlib
-Requires:	@rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
+Requires:	@rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
 %endif
 
 %if %build_gcj
@@ -83,7 +82,7 @@ BuildRequires:	zlib-devel
 # Building gnat requires gnat
 # This really isn't available until RedHat 8.0.  How to conditionalize this?
 BuildRequires:	gcc-gnat
-BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release}
+BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
 %endif
 %if %build_f95
 BuildRequires: gmp-devel
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index 8160444978..38900f4ff5 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -9,7 +9,7 @@ Version:        %{gcc_rpmvers}
 License:	GPL
 
 %if "%{_build}" != "%{_host}"
-BuildRequires:  @rpmprefix@@tool_target@-gcc-c++
+BuildRequires:  @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
 %endif
 Provides:	@rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
 Obsoletes:	@rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
@@ -35,10 +35,6 @@ GCC c++ compiler for @tool_target@.
 %{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
 
 %dir %{gcclib}/@tool_target@/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
 %{gcclib}/@tool_target@/%{gcc_version}/include/c++
-%else
-%{gcclib}/@tool_target@/%{gcc_version}/include/g++
-%endif
 %endif
 
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 042b72757e..0e4fc99cb4 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -6,7 +6,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       @rpmprefix@@tool_target@-binutils
-# Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
+# Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
 # License:	GPL
 
 # %if %build_infos
diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add
index e40908d21a..8f8ba045cb 100644
--- a/contrib/crossrpms/gcc/target-newlib.add
+++ b/contrib/crossrpms/gcc/target-newlib.add
@@ -7,9 +7,7 @@ Summary:      	C Library (newlib) for @tool_target@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-
-Provides:	@rpmprefix@@tool_target@-libc = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-libc < %{newlib_version}-%{release}
+Release:        @NEWLIB_RPMREL@
 
 %if %build_infos
 Requires:	@rpmprefix@newlib-common