From 86c81eecf17847d9525bf14a361d60ccf01ad577 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 30 Aug 2005 05:44:56 +0000 Subject: Use gccnewlib_version. Cosmetics. Minor cleanups. --- scripts/gccnewlib/base-g77.add | 9 ++++----- scripts/gccnewlib/base-gcc.add | 4 ++-- scripts/gccnewlib/gccnewlib.add | 2 +- scripts/gccnewlib/target-c++.add | 8 ++++---- scripts/gccnewlib/target-g77.add | 8 ++++---- scripts/gccnewlib/target-gcj.add | 8 ++++---- scripts/gccnewlib/target-gfortran.add | 2 +- scripts/gccnewlib/target-gnat.add | 8 ++++---- scripts/gccnewlib/target-objc.add | 4 ++-- 9 files changed, 26 insertions(+), 27 deletions(-) (limited to 'scripts/gccnewlib') diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add index fa2a7580d5..3ca2d0361c 100644 --- a/scripts/gccnewlib/base-g77.add +++ b/scripts/gccnewlib/base-g77.add @@ -4,11 +4,10 @@ # rtems-base-g77 # ============================================================== %package -n %{rpmprefix}rtems@osversion@-base-g77 -Summary: rtems base package for gcc/g77 compiler -Group: %{rpmgroup} -Requires: rtems-base-gcc -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Summary: rtems base package for gcc/g77 compiler +Group: %{rpmgroup} +Requires(post): /sbin/install-info +Requires(preun): /sbin/install-info %description -n %{rpmprefix}rtems@osversion@-base-g77 RTEMS is an open source operating system for embedded systems. diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add index dd8d773f4f..32a3e6b94c 100644 --- a/scripts/gccnewlib/base-gcc.add +++ b/scripts/gccnewlib/base-gcc.add @@ -3,8 +3,8 @@ # %{rpmprefix}rtems@osversion@-base-gcc # ============================================================== %package -n %{rpmprefix}rtems@osversion@-base-gcc -Summary: base package for rtems gcc and newlib C Library -Group: %{rpmgroup} +Summary: base package for rtems gcc and newlib C Library +Group: %{rpmgroup} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index cd6eafdf82..a7335b79a9 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -124,7 +124,7 @@ BuildRequires: zlib-devel # This really isn't available until RedHat 8.0. How to conditionalize this? BuildRequires: gcc-gnat # Urgh, building gnat requires the target c-toolchain -BuildRequires: %{rpmprefix}%{gcc_target}-gcc < %{version}-%{release} +BuildRequires: %{rpmprefix}%{gcc_target}-gcc < %{gccnewlib_version}-%{release} %endif %if %build_f95 BuildRequires: gmp-devel diff --git a/scripts/gccnewlib/target-c++.add b/scripts/gccnewlib/target-c++.add index 1043a9df1a..df757c6794 100644 --- a/scripts/gccnewlib/target-c++.add +++ b/scripts/gccnewlib/target-c++.add @@ -3,10 +3,10 @@ # %{gcc_target}-c++ # ============================================================== %package -n %{rpmprefix}%{gcc_target}-c++ -Summary: gcc/g++ compiler (c++) for %{gcc_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}rtems@osversion@-base-gcc -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Summary: gcc/g++ compiler (c++) for %{gcc_target} +Group: %{rpmgroup} +Requires: %{rpmprefix}rtems@osversion@-base-gcc +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_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 e60666ca80..7124ef5fda 100644 --- a/scripts/gccnewlib/target-g77.add +++ b/scripts/gccnewlib/target-g77.add @@ -3,10 +3,10 @@ # %{gcc_target}-g77 # ============================================================== %package -n %{rpmprefix}%{gcc_target}-g77 -Summary: gcc/g77 compiler for %{gcc_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}rtems@osversion@-base-g77 -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Summary: gcc/g77 compiler for %{gcc_target} +Group: %{rpmgroup} +Requires: %{rpmprefix}rtems@osversion@-base-g77 +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release} %description -n %{rpmprefix}%{gcc_target}-g77 RTEMS is an open source operating system for embedded systems. diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add index c204bf741e..97390c6a6a 100644 --- a/scripts/gccnewlib/target-gcj.add +++ b/scripts/gccnewlib/target-gcj.add @@ -3,10 +3,10 @@ # %{gcc_target}-gcj # ============================================================== %package -n %{rpmprefix}%{gcc_target}-gcj -Summary: gcc/java compiler (gcj) for %{gcc_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}rtems@osversion@-base-gcj -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Summary: gcc/java compiler (gcj) for %{gcc_target} +Group: %{rpmgroup} +Requires: %{rpmprefix}rtems@osversion@-base-gcj +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_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 2a4d082341..4b622297f4 100644 --- a/scripts/gccnewlib/target-gfortran.add +++ b/scripts/gccnewlib/target-gfortran.add @@ -6,7 +6,7 @@ Summary: gcc/gfortran compiler for %{gcc_target} Group: %{rpmgroup} Requires: %{rpmprefix}rtems@osversion@-base-gfortran -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_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 7200b9493a..d6303e08b5 100644 --- a/scripts/gccnewlib/target-gnat.add +++ b/scripts/gccnewlib/target-gnat.add @@ -3,10 +3,10 @@ # %{gcc_target}-gnat # ============================================================== %package -n %{rpmprefix}%{gcc_target}-gnat -Summary: gcc/gnat compiler for %{gcc_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}rtems@osversion@-base-gnat -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Summary: gcc/gnat compiler for %{gcc_target} +Group: %{rpmgroup} +Requires: %{rpmprefix}rtems@osversion@-base-gnat +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_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 7d23a55bda..3a5edc7b85 100644 --- a/scripts/gccnewlib/target-objc.add +++ b/scripts/gccnewlib/target-objc.add @@ -4,8 +4,8 @@ # ============================================================== %package -n %{rpmprefix}%{gcc_target}-objc Summary: gcc/objc compiler for %{gcc_target} -Group: %{rpmgroup} -Requires: %{rpmprefix}%{gcc_target}-gcc = %{version}-%{release} +Group: %{rpmgroup} +Requires: %{rpmprefix}%{gcc_target}-gcc = %{gccnewlib_version}-%{release} %description -n %{rpmprefix}%{gcc_target}-objc RTEMS is an open source operating system for embedded systems. -- cgit v1.2.3