diff options
-rw-r--r-- | scripts/ChangeLog | 4 | ||||
-rw-r--r-- | scripts/binutils/binutils.add | 6 | ||||
-rw-r--r-- | scripts/gccnewlib/gccnewlib.add | 15 | ||||
-rw-r--r-- | scripts/gdb/gdb.add | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 679ec75aa1..903463add4 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,5 +1,9 @@ 2005-04-25 Ralf Corsepius <ralf.corsepius@rtems.org> + * binutils/binutils.add: Use BuildRequires instead of BuildPreReq. + * gccnewlib/gccnewlib.add: Use BuildRequires instead of BuildPreReq. + * gdb/gdb.add: Use BuildRequires instead of BuildPreReq. + * gccnewlib/gccnewlib.add: Remove Source0-magic for gcc < 3.0. * gccnewlib/gccnewlib.add: Abandon c4x-*. 2005-04-23 Ralf Corsepius <ralf.corsepius@rtems.org> diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 3fe75d3ee7..5927d88a97 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -9,9 +9,9 @@ Release: @Release@ License: GPL/LGPL Packager: ralf.corsepius@rtems.org and joel@OARcorp.com -BuildPreReq: /sbin/install-info -BuildPreReq: texinfo >= 4.2 -BuildPreReq: flex +BuildRequires: /sbin/install-info +BuildRequires: texinfo >= 4.2 +BuildRequires: flex Version: %{binutils_version} Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_version}@binutils_suffix@ diff --git a/scripts/gccnewlib/gccnewlib.add b/scripts/gccnewlib/gccnewlib.add index 2e7bcd7f23..6f7495c862 100644 --- a/scripts/gccnewlib/gccnewlib.add +++ b/scripts/gccnewlib/gccnewlib.add @@ -15,20 +15,13 @@ Packager: ralf.corsepius@rtems.org and joel@OARcorp.com Version: gcc%{gcc_version}newlib%{newlib_version} -%if "%{gcc_version}" >= "3.2.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}@gcc_suffix@ -%else -%if "%{gcc_version}" >= "3.0" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}.tar.gz -%else -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}-everything.tar.gz -%endif -%endif +Source0: ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}/gcc-%{gcc_version}@gcc_suffix@ Source1: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}@newlib_suffix@ @PATCH1@ @PATCH3@ -BuildPreReq: texinfo >= 4.2 -BuildPreReq: %{rpmprefix}%{gcc_target}-binutils +BuildRequires: texinfo >= 4.2 +BuildRequires: %{rpmprefix}%{gcc_target}-binutils + # # The original sources are not included in the source RPM. # If we included them, then the source RPMs for each target diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index 3ad34c6f93..4fa8f3ac69 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -23,7 +23,7 @@ Source0: ftp://ftp.gnu.org/pub/gnu/gdb-%{gdb_version}@gdb_suffix@ %endif %if "%{_vendor}" == "redhat" -BuildPreReq: ncurses-devel +BuildRequires: ncurses-devel %endif # |