Eliminate @osversion. Hard-code 4.7.

16 files changed, 52 insertions, 52 deletions

diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add
index 9a0dd26d17..99defe3c56 100644
--- a/contrib/crossrpms/binutils/base-binutils.add
+++ b/contrib/crossrpms/binutils/base-binutils.add
@@ -2,19 +2,19 @@
 # ==============================================================
 # rtems-base-binutils
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-binutils
+%package -n @rpmprefix@rtems4.7-base-binutils
 Summary:      base package for rtems binutils
 Group: Development/Tools
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-binutils
+%description -n @rpmprefix@rtems4.7-base-binutils
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the base for binutils regardless of target CPU.
 
-%post -n @rpmprefix@rtems@osversion@-base-binutils
+%post -n @rpmprefix@rtems4.7-base-binutils
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz
@@ -24,7 +24,7 @@ This is the base for binutils regardless of target CPU.
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gasp.info.gz
 %endif
 
-%preun -n @rpmprefix@rtems@osversion@-base-binutils
+%preun -n @rpmprefix@rtems4.7-base-binutils
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz
@@ -36,7 +36,7 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
-%files -n @rpmprefix@rtems@osversion@-base-binutils
+%files -n @rpmprefix@rtems4.7-base-binutils
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add
index 5c66d1ca96..4c06095d47 100644
--- a/contrib/crossrpms/binutils/binutils.add
+++ b/contrib/crossrpms/binutils/binutils.add
@@ -14,7 +14,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Required for building the infos
 BuildRequires:	/sbin/install-info
 BuildRequires:	texinfo >= 4.2
-Requires:	@rpmprefix@rtems@osversion@-base-binutils
+Requires:	@rpmprefix@rtems4.7-base-binutils
 %endif
 BuildRequires:	flex
 BuildRequires:	bison
diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add
index 6211d0a737..f2530cd87c 100644
--- a/contrib/crossrpms/binutils/target-binutils.add
+++ b/contrib/crossrpms/binutils/target-binutils.add
@@ -4,7 +4,7 @@
 # %package -n @rpmprefix@@tool_target@-binutils
 # Summary:      rtems binutils for @tool_target@
 # Group: Development/Tools
-# Requires: @rpmprefix@rtems@osversion@-base-binutils
+# Requires: @rpmprefix@rtems4.7-base-binutils
 
 %description -n @rpmprefix@@tool_target@-binutils
 
diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add
index 9b610dd17c..ad52718dfb 100644
--- a/contrib/crossrpms/gcc/base-g77.add
+++ b/contrib/crossrpms/gcc/base-g77.add
@@ -3,7 +3,7 @@
 # ==============================================================
 # rtems-base-g77
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-g77
+%package -n @rpmprefix@rtems4.7-base-g77
 Summary:        Base package for RTEMS gcc/g77 compiler
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -12,21 +12,21 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun): 	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-g77
+%description -n @rpmprefix@rtems4.7-base-g77
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/g77 that are shared by all targets.
 
-%files -n @rpmprefix@rtems@osversion@-base-g77
+%files -n @rpmprefix@rtems4.7-base-g77
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/g77.info*.gz
 
-%post -n @rpmprefix@rtems@osversion@-base-g77
+%post -n @rpmprefix@rtems4.7-base-g77
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/g77.info.gz 
 
-%preun -n @rpmprefix@rtems@osversion@-base-g77
+%preun -n @rpmprefix@rtems4.7-base-g77
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/g77.info.gz
 fi
diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add
index ace9b3eefe..32ddb1d665 100644
--- a/contrib/crossrpms/gcc/base-gcc.add
+++ b/contrib/crossrpms/gcc/base-gcc.add
@@ -1,8 +1,8 @@
 %if %build_infos
 # ==============================================================
-# @rpmprefix@rtems@osversion@-base-gcc
+# @rpmprefix@rtems4.7-base-gcc
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-gcc
+%package -n @rpmprefix@rtems4.7-base-gcc
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -11,11 +11,11 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-gcc
+%description -n @rpmprefix@rtems4.7-base-gcc
 
 GCC files that are shared by all targets.
 
-%files -n @rpmprefix@rtems@osversion@-base-gcc
+%files -n @rpmprefix@rtems4.7-base-gcc
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
@@ -38,7 +38,7 @@ GCC files that are shared by all targets.
 %{_mandir}/man7/gfdl.7*
 %{_mandir}/man7/gpl.7*
 
-%post -n @rpmprefix@rtems@osversion@-base-gcc
+%post -n @rpmprefix@rtems4.7-base-gcc
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz
@@ -47,7 +47,7 @@ GCC files that are shared by all targets.
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz
 %endif
 
-%preun -n @rpmprefix@rtems@osversion@-base-gcc
+%preun -n @rpmprefix@rtems4.7-base-gcc
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz
diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add
index 421e50794f..c6243b6d90 100644
--- a/contrib/crossrpms/gcc/base-gcj.add
+++ b/contrib/crossrpms/gcc/base-gcj.add
@@ -3,7 +3,7 @@
 # ==============================================================
 # rtems-base-gcj
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-gcj
+%package -n @rpmprefix@rtems4.7-base-gcj
 Summary:        Base package for rtems gcc/java compiler (gcj)
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -12,12 +12,12 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-gcj
+%description -n @rpmprefix@rtems4.7-base-gcj
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/java (gcj) that are shared by all targets.
 
-%files -n @rpmprefix@rtems@osversion@-base-gcj
+%files -n @rpmprefix@rtems4.7-base-gcj
 %defattr(-,root,root)
 %if "%{gcc_version}" <= "3.4"
 %sysdir %{_bindir}
@@ -48,14 +48,14 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %endif
 %endif
 
-%post -n @rpmprefix@rtems@osversion@-base-gcj
+%post -n @rpmprefix@rtems4.7-base-gcj
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info*
 
 %if "%{gcc_version}" >= "3.3"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info*
 %endif
 
-%preun -n @rpmprefix@rtems@osversion@-base-gcj
+%preun -n @rpmprefix@rtems4.7-base-gcj
 if [ $1 -eq 0 ]; then
 /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info*
 
diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add
index 73161781b3..45142711c9 100644
--- a/contrib/crossrpms/gcc/base-gfortran.add
+++ b/contrib/crossrpms/gcc/base-gfortran.add
@@ -1,9 +1,9 @@
 %if %build_infos
 %if %build_f95
 # ==============================================================
-# @rpmprefix@rtems@osversion@-base-gfortran
+# @rpmprefix@rtems4.7-base-gfortran
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-gfortran
+%package -n @rpmprefix@rtems4.7-base-gfortran
 Summary:	Base package for RTEMS gcc/gfortran compiler
 Group:          Development/Tools
 License:	GPL
@@ -11,21 +11,21 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-gfortran
+%description -n @rpmprefix@rtems4.7-base-gfortran
 RTEMS is an open source operating system for embedded systems.
 
 This is the files for gcc/gfortran that are shared by all targets.
 
-%files -n @rpmprefix@rtems@osversion@-base-gfortran
+%files -n @rpmprefix@rtems4.7-base-gfortran
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/gfortran.info*.gz
 
-%post -n @rpmprefix@rtems@osversion@-base-gfortran
+%post -n @rpmprefix@rtems4.7-base-gfortran
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz
 
-%preun -n @rpmprefix@rtems@osversion@-base-gfortran
+%preun -n @rpmprefix@rtems4.7-base-gfortran
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz
 fi
diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add
index a89bd6a3ae..c9b17f2104 100644
--- a/contrib/crossrpms/gcc/base-gnat.add
+++ b/contrib/crossrpms/gcc/base-gnat.add
@@ -3,7 +3,7 @@
 # ==============================================================
 # rtems-base-gnat
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-gnat
+%package -n @rpmprefix@rtems4.7-base-gnat
 Summary:	Base package for RTEMS gcc/gnat compiler
 Group: 		Development/Tools
 License:	GPL
@@ -11,12 +11,12 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-gnat
+%description -n @rpmprefix@rtems4.7-base-gnat
 RTEMS is an open source operating system for embedded systems.
 
 This is the gcc/gnat tools for the gcc/gnat compiler
 
-%files -n @rpmprefix@rtems@osversion@-base-gnat
+%files -n @rpmprefix@rtems4.7-base-gnat
 %defattr(-,root,root)
 %sysdir %{_bindir}
 %{_bindir}/vxaddr2line%{_exeext}
@@ -25,12 +25,12 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 %ghost %{_infodir}/dir
 %{_infodir}/gnat*
 
-%post -n @rpmprefix@rtems@osversion@-base-gnat
+%post -n @rpmprefix@rtems4.7-base-gnat
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
 
-%preun -n @rpmprefix@rtems@osversion@-base-gnat
+%preun -n @rpmprefix@rtems4.7-base-gnat
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz
diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
index 9c53c273e8..6dcd17ec75 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -1,34 +1,34 @@
 %if %build_infos
 %if %build_newlib
 # ==============================================================
-# @rpmprefix@rtems@osversion@-base-newlib
+# @rpmprefix@rtems4.7-base-newlib
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-newlib
+%package -n @rpmprefix@rtems4.7-base-newlib
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
 License:	Distributable
 
-Provides:	@rpmprefix@rtems@osversion@-base-libc = %{newlib_version}-%{release}
+Provides:	@rpmprefix@rtems4.7-base-libc = %{newlib_version}-%{release}
 
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-newlib
+%description -n @rpmprefix@rtems4.7-base-newlib
 newlib files that are shared by all targets.
 
-%files -n @rpmprefix@rtems@osversion@-base-newlib
+%files -n @rpmprefix@rtems4.7-base-newlib
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*
 %{_infodir}/libm.info*
 
-%post -n @rpmprefix@rtems@osversion@-base-newlib
+%post -n @rpmprefix@rtems4.7-base-newlib
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz
 
-%preun -n @rpmprefix@rtems@osversion@-base-newlib
+%preun -n @rpmprefix@rtems4.7-base-newlib
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index ad0fae0d7f..7ea1cd037b 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 "%{_prefix}" != "/usr"
-Requires:       @rpmprefix@rtems@osversion@-base-gcc
+Requires:       @rpmprefix@rtems4.7-base-gcc
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
diff --git a/contrib/crossrpms/gcc/target-g77.add b/contrib/crossrpms/gcc/target-g77.add
index c198fcc16b..1ad1313ecf 100644
--- a/contrib/crossrpms/gcc/target-g77.add
+++ b/contrib/crossrpms/gcc/target-g77.add
@@ -7,7 +7,7 @@ Summary:        Fortran 77 support for @tool_target@-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Requires:       @rpmprefix@rtems@osversion@-base-g77
+Requires:       @rpmprefix@rtems4.7-base-g77
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
 %description -n @rpmprefix@@tool_target@-g77
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
index 678f3f7153..564bc4d6ce 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -9,7 +9,7 @@ Version:        %{gcc_rpmvers}
 License:	GPL
 
 %if "%{_prefix}" != "/usr"
-Requires:       @rpmprefix@rtems@osversion@-base-gcj
+Requires:       @rpmprefix@rtems4.7-base-gcj
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
index 956a55170e..2fb0b7ee17 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -9,7 +9,7 @@ Version:        %{gcc_rpmvers}
 License:	GPL
 
 %if "%{_prefix}" != "/usr"
-Requires:       @rpmprefix@rtems@osversion@-base-gfortran
+Requires:       @rpmprefix@rtems4.7-base-gfortran
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 Obsoletes:      @rpmprefix@@tool_target@-g77
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
index 2161f0b91d..b0e3c3cbe4 100644
--- a/contrib/crossrpms/gcc/target-gnat.add
+++ b/contrib/crossrpms/gcc/target-gnat.add
@@ -9,7 +9,7 @@ Version:        %{gcc_rpmvers}
 License:	GPL
 
 %if "%{_prefix}" != "/usr"
-Requires:       @rpmprefix@rtems@osversion@-base-gnat
+Requires:       @rpmprefix@rtems4.7-base-gnat
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add
index 80b38b4660..daf09ce994 100644
--- a/contrib/crossrpms/gdb/base-gdb.add
+++ b/contrib/crossrpms/gdb/base-gdb.add
@@ -2,19 +2,19 @@
 # ==============================================================
 # rtems-base-gdb
 # ==============================================================
-%package -n @rpmprefix@rtems@osversion@-base-gdb
+%package -n @rpmprefix@rtems4.7-base-gdb
 Summary:      base package for rtems gdb
 Group: Development/Tools
 Requires(post):		/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems@osversion@-base-gdb
+%description -n @rpmprefix@rtems4.7-base-gdb
 
 RTEMS is an open source operating system for embedded systems.
 
 This is the base for gdb regardless of target CPU.
 
-%post -n @rpmprefix@rtems@osversion@-base-gdb
+%post -n @rpmprefix@rtems4.7-base-gdb
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz
 %if "%{gdb_version}" < "6.3"
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/mmalloc.info.gz
@@ -27,7 +27,7 @@ This is the base for gdb regardless of target CPU.
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz
 %endif
 
-%preun -n @rpmprefix@rtems@osversion@-base-gdb
+%preun -n @rpmprefix@rtems4.7-base-gdb
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz
 %if "%{gdb_version}" < "6.3"
@@ -42,7 +42,7 @@ if [ $1 -eq 0 ]; then
 %endif
 fi
 
-%files -n @rpmprefix@rtems@osversion@-base-gdb
+%files -n @rpmprefix@rtems4.7-base-gdb
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
diff --git a/contrib/crossrpms/gdb/target-gdb.add b/contrib/crossrpms/gdb/target-gdb.add
index 8db11997b5..c5b2f1bfca 100644
--- a/contrib/crossrpms/gdb/target-gdb.add
+++ b/contrib/crossrpms/gdb/target-gdb.add
@@ -4,7 +4,7 @@
 # %package -n @rpmprefix@@tool_target@-gdb
 # Summary:      rtems gdb for @tool_target@
 # Group: Development/Tools
-# Requires: @rpmprefix@rtems@osversion@-base-gdb
+# Requires: @rpmprefix@rtems4.7-base-gdb
 
 %description -n @rpmprefix@@tool_target@-gdb