Switch to using %gcc_version.

10 files changed, 18 insertions, 10 deletions

diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add
index 3ca2d0361c..7b98baf363 100644
--- a/scripts/gccnewlib/base-g77.add
+++ b/scripts/gccnewlib/base-g77.add
@@ -6,6 +6,8 @@
 %package -n %{rpmprefix}rtems@osversion@-base-g77
 Summary:        rtems base package for gcc/g77 compiler
 Group:          %{rpmgroup}
+Version:        %{gcc_version}
+
 Requires(post): 	/sbin/install-info
 Requires(preun): 	/sbin/install-info
 
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index 32a3e6b94c..a2adbf6c45 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -5,6 +5,7 @@
 %package -n %{rpmprefix}rtems@osversion@-base-gcc
 Summary:	base package for rtems gcc and newlib C Library 
 Group:          %{rpmgroup}
+Version:        %{gcc_version}
 
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add
index 5ad9e08e23..0cc71f1fbb 100644
--- a/scripts/gccnewlib/base-gcj.add
+++ b/scripts/gccnewlib/base-gcj.add
@@ -6,6 +6,7 @@
 %package -n %{rpmprefix}rtems@osversion@-base-gcj
 Summary:        base package for rtems gcc/java compiler (gcj).
 Group:          %{rpmgroup}
+Version:        %{gcc_version}
 
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
diff --git a/scripts/gccnewlib/target-c++.add b/scripts/gccnewlib/target-c++.add
index 136deffcf3..3ecb5d64c3 100644
--- a/scripts/gccnewlib/target-c++.add
+++ b/scripts/gccnewlib/target-c++.add
@@ -5,10 +5,11 @@
 %package -n %{rpmprefix}%{gcc_target}-c++
 Summary:	gcc/g++ compiler (c++) for %{gcc_target}
 Group:          %{rpmgroup}
+Version:	%{gcc_version}
 %if "%{_prefix}" != "/usr"
 Requires:       %{rpmprefix}rtems@osversion@-base-gcc
 %endif
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 
 %description -n %{rpmprefix}%{gcc_target}-c++
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gccnewlib/target-g77.add b/scripts/gccnewlib/target-g77.add
index b981c6757a..7133081a85 100644
--- a/scripts/gccnewlib/target-g77.add
+++ b/scripts/gccnewlib/target-g77.add
@@ -5,8 +5,9 @@
 %package -n %{rpmprefix}%{gcc_target}-g77
 Summary:        gcc/g77 compiler for %{gcc_target}
 Group:          %{rpmgroup}
+Version:	%{gcc_version}
 Requires:       %{rpmprefix}rtems@osversion@-base-g77
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 
 %description -n %{rpmprefix}%{gcc_target}-g77
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gccnewlib/target-gcc.add b/scripts/gccnewlib/target-gcc.add
index f058441e4a..ff0867663d 100644
--- a/scripts/gccnewlib/target-gcc.add
+++ b/scripts/gccnewlib/target-gcc.add
@@ -4,16 +4,14 @@
 %package -n %{rpmprefix}%{gcc_target}-gcc
 Summary:      	rtems gcc and newlib C Library for %{gcc_target}
 Group:          %{rpmgroup}
+Version:        %{gcc_version}
 Requires:       %{rpmprefix}%{gcc_target}-binutils
 Requires:       %{rpmprefix}%{gcc_target}-libc = %{newlib_version}-%{release}
 
-Provides:       %{rpmprefix}%{gcc_target}-newlib = %{newlib_version}-%{release}
-Provides:       %{rpmprefix}%{gcc_target}-libc = %{newlib_version}-%{release}
-
 %description -n %{rpmprefix}%{gcc_target}-gcc
 RTEMS is an open source operating system for embedded systems.
 
-This is gcc and newlib C Library for %{gcc_target}.
+This is gcc for %{gcc_target}.
 
 %files -n %{rpmprefix}%{gcc_target}-gcc -f build/files.gcc
 %defattr(-,root,root)
diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add
index f2d96b5794..ef77aa36df 100644
--- a/scripts/gccnewlib/target-gcj.add
+++ b/scripts/gccnewlib/target-gcj.add
@@ -5,10 +5,11 @@
 %package -n %{rpmprefix}%{gcc_target}-gcj
 Summary:        gcc/java compiler (gcj) for %{gcc_target}
 Group:          %{rpmgroup}
+Version:	%{gcc_version}
 %if "%{_prefix}" != "/usr"
 Requires:       %{rpmprefix}rtems@osversion@-base-gcj
 %endif
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 
 %description -n %{rpmprefix}%{gcc_target}-gcj
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gccnewlib/target-gfortran.add b/scripts/gccnewlib/target-gfortran.add
index a02e6dfbf0..d0e28e91fb 100644
--- a/scripts/gccnewlib/target-gfortran.add
+++ b/scripts/gccnewlib/target-gfortran.add
@@ -5,10 +5,11 @@
 %package -n %{rpmprefix}%{gcc_target}-gfortran
 Summary:	gcc/gfortran compiler for %{gcc_target}
 Group:          %{rpmgroup}
+Version:	%{gcc_version}
 %if "%{_prefix}" != "/usr"
 Requires:       %{rpmprefix}rtems@osversion@-base-gfortran
 %endif
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 Obsoletes:      %{rpmprefix}%{gcc_target}-g77
 
 %description -n %{rpmprefix}%{gcc_target}-gfortran
diff --git a/scripts/gccnewlib/target-gnat.add b/scripts/gccnewlib/target-gnat.add
index 52712ea447..8adeb1205c 100644
--- a/scripts/gccnewlib/target-gnat.add
+++ b/scripts/gccnewlib/target-gnat.add
@@ -5,10 +5,11 @@
 %package -n %{rpmprefix}%{gcc_target}-gnat
 Summary:        gcc/gnat compiler for %{gcc_target}
 Group:          %{rpmgroup}
+Version:        %{gcc_version}
 %if "%{_prefix}" != "/usr"
 Requires:       %{rpmprefix}rtems@osversion@-base-gnat
 %endif
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 
 %description -n %{rpmprefix}%{gcc_target}-gnat
 RTEMS is an open source operating system for embedded systems.
diff --git a/scripts/gccnewlib/target-objc.add b/scripts/gccnewlib/target-objc.add
index 4e763520a5..2636cd1b09 100644
--- a/scripts/gccnewlib/target-objc.add
+++ b/scripts/gccnewlib/target-objc.add
@@ -5,7 +5,8 @@
 %package -n %{rpmprefix}%{gcc_target}-objc
 Summary:        gcc/objc compiler for %{gcc_target}
 Group:          %{rpmgroup}
-Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release}
+Version:        %{gcc_version}
+Requires:       %{rpmprefix}%{gcc_target}-gcc = %{gcc_version}-%{release}
 
 %description -n %{rpmprefix}%{gcc_target}-objc
 RTEMS is an open source operating system for embedded systems.