Rename *base packages into gcc*-common

6 files changed, 69 insertions, 35 deletions

diff --git a/contrib/crossrpms/gcc/base-g77.add b/contrib/crossrpms/gcc/base-g77.add
index 5caf382f06..fbd7f36a47 100644
--- a/contrib/crossrpms/gcc/base-g77.add
+++ b/contrib/crossrpms/gcc/base-g77.add
@@ -1,9 +1,9 @@
 %if %build_infos
 %if %build_g77
 # ==============================================================
-# @rpmprefix@rtems4.7-base-g77
+# @rpmprefix@gcc-g77-common
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-g77
+%package -n @rpmprefix@gcc-g77-common
 Summary:        Base package for RTEMS gcc/g77 compiler
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -12,21 +12,26 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun): 	/sbin/install-info
 
-%description -n @rpmprefix@rtems4.7-base-g77
+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.
 
 This is the files for gcc/g77 that are shared by all targets.
 
-%files -n @rpmprefix@rtems4.7-base-g77
+%files -n @rpmprefix@gcc-g77-common
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/g77.info*.gz
 
-%post -n @rpmprefix@rtems4.7-base-g77
+%post -n @rpmprefix@gcc-g77-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/g77.info.gz 
 
-%preun -n @rpmprefix@rtems4.7-base-g77
+%preun -n @rpmprefix@gcc-g77-common
 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 32ddb1d665..451d9b8ace 100644
--- a/contrib/crossrpms/gcc/base-gcc.add
+++ b/contrib/crossrpms/gcc/base-gcc.add
@@ -2,7 +2,7 @@
 # ==============================================================
 # @rpmprefix@rtems4.7-base-gcc
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-gcc
+%package -n @rpmprefix@gcc-common
 Summary:	Base package for rtems gcc and newlib C Library
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -11,11 +11,16 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems4.7-base-gcc
+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.
 
-%files -n @rpmprefix@rtems4.7-base-gcc
+%files -n @rpmprefix@gcc-common
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
@@ -38,7 +43,7 @@ GCC files that are shared by all targets.
 %{_mandir}/man7/gfdl.7*
 %{_mandir}/man7/gpl.7*
 
-%post -n @rpmprefix@rtems4.7-base-gcc
+%post -n @rpmprefix@gcc-common
   /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 +52,7 @@ GCC files that are shared by all targets.
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz
 %endif
 
-%preun -n @rpmprefix@rtems4.7-base-gcc
+%preun -n @rpmprefix@gcc-common
 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 aba71ec865..9c00a06de5 100644
--- a/contrib/crossrpms/gcc/base-gcj.add
+++ b/contrib/crossrpms/gcc/base-gcj.add
@@ -1,9 +1,9 @@
 %if %build_infos
 %if %build_gcj
 # ==============================================================
-# @rpmprefix@rtems4.7-base-gcj
+# @rpmprefix@gcc-gcj-common
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-gcj
+%package -n @rpmprefix@gcc-gcj-common
 Summary:        Base package for rtems gcc/java compiler (gcj)
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
@@ -12,12 +12,17 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems4.7-base-gcj
+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.
 
 This is the files for gcc/java (gcj) that are shared by all targets.
 
-%files -n @rpmprefix@rtems4.7-base-gcj
+%files -n @rpmprefix@gcc-gcj-common
 %defattr(-,root,root)
 %if "%{gcc_version}" <= "3.4"
 %sysdir %{_bindir}
@@ -48,14 +53,14 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %endif
 %endif
 
-%post -n @rpmprefix@rtems4.7-base-gcj
+%post -n @rpmprefix@gcc-gcj-common
 /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@rtems4.7-base-gcj
+%preun -n @rpmprefix@gcc-gcj-common
 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 45142711c9..0100b975d0 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@rtems4.7-base-gfortran
+# @rpmprefix@gcc-gfortran-common
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-gfortran
+%package -n @rpmprefix@gcc-gfortran-common
 Summary:	Base package for RTEMS gcc/gfortran compiler
 Group:          Development/Tools
 License:	GPL
@@ -11,21 +11,26 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems4.7-base-gfortran
+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.
 
 This is the files for gcc/gfortran that are shared by all targets.
 
-%files -n @rpmprefix@rtems4.7-base-gfortran
+%files -n @rpmprefix@gcc-gfortran-common
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/gfortran.info*.gz
 
-%post -n @rpmprefix@rtems4.7-base-gfortran
+%post -n @rpmprefix@gcc-gfortran-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz
 
-%preun -n @rpmprefix@rtems4.7-base-gfortran
+%preun -n @rpmprefix@gcc-gfortran-common
 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 f9a2480084..c4aa393f11 100644
--- a/contrib/crossrpms/gcc/base-gnat.add
+++ b/contrib/crossrpms/gcc/base-gnat.add
@@ -1,9 +1,9 @@
 %if %build_infos
 %if %build_gnat
 # ==============================================================
-# @rpmprefix@rtems4.7-base-gnat
+# @rpmprefix@gcc-gnat-common
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-gnat
+%package -n @rpmprefix@gcc-gnat-common
 Summary:	Base package for RTEMS gcc/gnat compiler
 Group: 		Development/Tools
 License:	GPL
@@ -11,12 +11,17 @@ License:	GPL
 Requires(post): 	/sbin/install-info
 Requires(preun):	/sbin/install-info
 
-%description -n @rpmprefix@rtems4.7-base-gnat
+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.
 
 This is the gcc/gnat tools for the gcc/gnat compiler
 
-%files -n @rpmprefix@rtems4.7-base-gnat
+%files -n @rpmprefix@gcc-gnat-common
 %defattr(-,root,root)
 %sysdir %{_bindir}
 %{_bindir}/vxaddr2line%{_exeext}
@@ -25,12 +30,12 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 %ghost %{_infodir}/dir
 %{_infodir}/gnat*
 
-%post -n @rpmprefix@rtems4.7-base-gnat
+%post -n @rpmprefix@gcc-gnat-common
   /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@rtems4.7-base-gnat
+%preun -n @rpmprefix@gcc-gnat-common
 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 6dcd17ec75..f8f42b63f8 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -1,34 +1,43 @@
 %if %build_infos
 %if %build_newlib
 # ==============================================================
-# @rpmprefix@rtems4.7-base-newlib
+# @rpmprefix@newlib-common
 # ==============================================================
-%package -n @rpmprefix@rtems4.7-base-newlib
+%package -n @rpmprefix@newlib-common
 Summary:	Base package for RTEMS newlib C Library
 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
 
-%description -n @rpmprefix@rtems4.7-base-newlib
+%description -n @rpmprefix@newlib-common
 newlib files that are shared by all targets.
 
-%files -n @rpmprefix@rtems4.7-base-newlib
+%files -n @rpmprefix@newlib-common
 %defattr(-,root,root)
 %sysdir %{_infodir}
 %ghost %{_infodir}/dir
 %{_infodir}/libc.info*
 %{_infodir}/libm.info*
 
-%post -n @rpmprefix@rtems4.7-base-newlib
+%post -n @rpmprefix@newlib-common
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz
 
-%preun -n @rpmprefix@rtems4.7-base-newlib
+%preun -n @rpmprefix@newlib-common
 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