Various patches from rtems-4-8-testing branch.

7 files changed, 2 insertions, 38 deletions

diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add
index 7ce936c45a..a3f7a7f293 100644
--- a/contrib/crossrpms/gcc/base-g77.add
+++ b/contrib/crossrpms/gcc/base-g77.add
@@ -12,11 +12,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun): 	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-g77 = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-g77 < %{gcc_rpmvers}-%{release}
-Provides:	@rpmprefix@rtems-base-g77 = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-g77 < %{gcc_rpmvers}-%{release}
-
 %description -n @rpmprefix@gcc-g77-common
 RTEMS is an open source operating system for embedded systems.
 
diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add
index d1447a627e..b272e59c26 100644
--- a/contrib/crossrpms/gcc/base-gcc.add
+++ b/contrib/crossrpms/gcc/base-gcc.add
@@ -1,6 +1,6 @@
 %if %build_infos
 # ==============================================================
-# @rpmprefix@rtems4.7-base-gcc
+# @rpmprefix@gcc-common
 # ==============================================================
 %package -n @rpmprefix@gcc-common
 Summary:	Base package for rtems gcc and newlib C Library
@@ -11,11 +11,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-gcc < %{gcc_rpmvers}-%{release}
-Provides:	@rpmprefix@rtems-base-gcc = %{gcc_version}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-gcc < %{gcc_rpmvers}-%{release}
-
 %description -n @rpmprefix@gcc-common
 
 GCC files that are shared by all targets.
diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add
index ea60f07232..6ad98195a8 100644
--- a/contrib/crossrpms/gcc/base-gcj.add
+++ b/contrib/crossrpms/gcc/base-gcj.add
@@ -12,11 +12,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-gcj = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-gcj < %{gcc_rpmvers}-%{release}
-Provides:	@rpmprefix@rtems-base-gcj = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-gcj < %{gcc_rpmvers}-%{release}
-
 %description -n @rpmprefix@gcc-gcj-common
 RTEMS is an open source operating system for embedded systems.
 
diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add
index 2045c5699d..e0bb76771b 100644
--- a/contrib/crossrpms/gcc/base-gfortran.add
+++ b/contrib/crossrpms/gcc/base-gfortran.add
@@ -11,11 +11,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-gfortran = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-gfortran < %{gcc_rpmvers}-%{release}
-Provides:	@rpmprefix@rtems-base-gfortran = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-gfortran < %{gcc_rpmvers}-%{release}
-
 %description -n @rpmprefix@gcc-gfortran-common
 RTEMS is an open source operating system for embedded systems.
 
diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add
index 8efd3d7e4f..71dc5cc2b6 100644
--- a/contrib/crossrpms/gcc/base-gnat.add
+++ b/contrib/crossrpms/gcc/base-gnat.add
@@ -11,11 +11,6 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-Provides:	@rpmprefix@rtems4.7-base-gnat = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-gnat < %{gcc_rpmvers}-%{release}
-Provides:	@rpmprefix@rtems-base-gnat = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-gnat < %{gcc_rpmvers}-%{release}
-
 %description -n @rpmprefix@gcc-gnat-common
 RTEMS is an open source operating system for embedded systems.
 
diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
index 9508de40f0..3648ee25a6 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -9,17 +9,6 @@ Group:          Development/Tools
 Version:        %{newlib_version}
 License:	Distributable
 
-Provides:	@rpmprefix@rtems4.7-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-newlib < %{newlib_version}-%{release}
-Provides:	@rpmprefix@rtems-base-newlib = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-newlib < %{newlib_version}-%{release}
-
-Provides:	@rpmprefix@rtems4.7-base-libc = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@rtems4.7-base-libc < %{newlib_version}-%{release}
-Provides:	@rpmprefix@rtems-base-libc = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@rtems-base-libc < %{newlib_version}-%{release}
-
-
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index fda95f3464..88eff27017 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -37,7 +37,7 @@ GNU cc compiler for @tool_target@.
 
 %dir %{gcclib}/@tool_target@/%{gcc_version}/include
 %if "%{gcc_version}" > "4.0.3"
-%if "@tool_target@" != "bfin-rtems4.7"
+%if "@tool_target@" != "bfin-rtems4.8"
 %dir %{gcclib}/@tool_target@/%{gcc_version}/include/ssp
 %endif
 %endif