From 77e6b7168f304c2f780af823fc0a69a2500e7b19 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 28 Aug 2009 07:23:11 +0000
Subject: [PATCH] Cleanup Obsoletes/Provides

---
 contrib/crossrpms/gcc/target-c++.add      | 2 --
 contrib/crossrpms/gcc/target-gcj.add      | 7 +++----
 contrib/crossrpms/gcc/target-gfortran.add | 4 ----
 contrib/crossrpms/gcc/target-gnat.add     | 1 -
 contrib/crossrpms/gcc/target-objc.add     | 2 --
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index 1a7c95bb2d..cb27e0a88e 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -11,8 +11,6 @@ License:	GPL
 %if "%{_build}" != "%{_host}"
 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}
 
 %if %build_infos
 Requires:       @rpmprefix@gcc-common
diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add
index 3d4e272cae..ae2183d176 100644
--- a/contrib/crossrpms/gcc/target-gcj.add
+++ b/contrib/crossrpms/gcc/target-gcj.add
@@ -2,24 +2,23 @@
 # ==============================================================
 # @rpmprefix@@tool_target@-gcj
 # ==============================================================
-%package -n @rpmprefix@@tool_target@-gcj
+%package -n @rpmprefix@@tool_target@-gcc-gcj
 Summary:        Java support (gcj) for @tool_target@-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Provides:	@rpmprefix@@tool_target@-gcc-gcj = %{gcc_rpmvers}-%{release}
 
 %if %build_infos
 Requires:       @rpmprefix@gcc-gcj-common
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
 
-%description -n @rpmprefix@@tool_target@-gcj
+%description -n @rpmprefix@@tool_target@-gcc-gcj
 RTEMS is an open source operating system for embedded systems.
 
 This is the gcc/java compiler for @tool_target@
 
-%files -n @rpmprefix@@tool_target@-gcj -f build/files.gcj
+%files -n @rpmprefix@@tool_target@-gcc-gcj -f build/files.gcj
 %defattr(-,root,root)
 %{_bindir}/@tool_target@-gcj%{_exeext}
 %{_bindir}/@tool_target@-jcf-dump%{_exeext}
diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add
index 64a6164589..0c2d8754a3 100644
--- a/contrib/crossrpms/gcc/target-gfortran.add
+++ b/contrib/crossrpms/gcc/target-gfortran.add
@@ -8,14 +8,10 @@ Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
 
-Provides:	@rpmprefix@@tool_target@-gfortran = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-gfortran < %{gcc_rpmvers}-%{release}
-
 %if %build_infos
 Requires:       @rpmprefix@gcc-gfortran-common
 %endif
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}
-Obsoletes:      @rpmprefix@@tool_target@-g77 < %{gcc_rpmvers}-%{release}
 
 %description -n @rpmprefix@@tool_target@-gcc-gfortran
 GCC fortran compiler for @tool_target@.
diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add
index 8e430d8369..10e74590a3 100644
--- a/contrib/crossrpms/gcc/target-gnat.add
+++ b/contrib/crossrpms/gcc/target-gnat.add
@@ -7,7 +7,6 @@ Summary:        Ada support for for @tool_target@-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Provides:	@rpmprefix@@tool_target@-gcc-gnat = %{gcc_rpmvers}-%{release}
 
 %if %_build_infos
 Requires:       @rpmprefix@gcc-gnat-common
diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add
index f485bb1af8..36759f0c85 100644
--- a/contrib/crossrpms/gcc/target-objc.add
+++ b/contrib/crossrpms/gcc/target-objc.add
@@ -7,8 +7,6 @@ Summary:        Objective C support for @tool_target@-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Provides:	@rpmprefix@@tool_target@-objc = %{gcc_rpmvers}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-objc < %{gcc_rpmvers}-%{release}
 
 Requires:       @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release}