From 56ea40bdcae63f8dafefbf1a56ebb03356af4fc2 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 3 Feb 2009 05:45:29 +0000
Subject: [PATCH] Eliminate %{newlib_release}.

---
 contrib/crossrpms/gcc/base-newlib.add   | 2 +-
 contrib/crossrpms/gcc/gccnewlib.add     | 5 ++---
 contrib/crossrpms/gcc/target-gcc.add    | 2 +-
 contrib/crossrpms/gcc/target-newlib.add | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
index ba11ba928b..73ee9e1fd7 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -7,7 +7,7 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        %{newlib_release}
+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 c781b33fe8..652844ae09 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -6,7 +6,6 @@
 %if %build_newlib
 %define newlib_pkgvers		@NEWLIB_PKGVERS@
 %define newlib_version		@NEWLIB_VERS@
-%define newlib_release		@NEWLIB_RPMREL@
 %endif
 
 %define mpfr_version	2.3.1
@@ -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}-%{newlib_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}-%{newlib_release}
+BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
 %endif
 %if %build_f95
 BuildRequires: gmp-devel
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 47543bfafc..b1c188430c 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}-%{newlib_release}
+# Requires:       @rpmprefix@@tool_target@-newlib = @NEWLIB_RPMREL@
 # License:	GPL
 
 # %if %build_infos
diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add
index f62b59ebfd..8f8ba045cb 100644
--- a/contrib/crossrpms/gcc/target-newlib.add
+++ b/contrib/crossrpms/gcc/target-newlib.add
@@ -7,7 +7,7 @@ Summary:      	C Library (newlib) for @tool_target@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        %{newlib_release}
+Release:        @NEWLIB_RPMREL@
 
 %if %build_infos
 Requires:	@rpmprefix@newlib-common