diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-01-26 04:55:44 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-01-26 04:55:44 +0000 |
| commit | fb85f5ab36188d5ce1367765d8611ead2c474c8b (patch) | |
| tree | fdc7b9d5e10b81a299f40ec0bfb46c868b0323e5 /contrib | |
| parent | Bump GCC_RPMREL. (diff) | |
| download | rtems-fb85f5ab36188d5ce1367765d8611ead2c474c8b.tar.bz2 | |
Add NEWLIB_RELEASE, %{newlib_release}.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/base-newlib.add | 1 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 5 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-gcc.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/target-newlib.add | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add index 3648ee25a6..ba11ba928b 100644 --- a/contrib/crossrpms/gcc/base-newlib.add +++ b/contrib/crossrpms/gcc/base-newlib.add @@ -7,6 +7,7 @@ Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: %{newlib_release} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index aabacf4b4b..cc3512d8c4 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -6,6 +6,7 @@ %if %build_newlib %define newlib_pkgvers @NEWLIB_PKGVERS@ %define newlib_version @NEWLIB_VERS@ +%define newlib_release @NEWLIB_RPMREL@ %define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %endif @@ -74,7 +75,7 @@ Requires: @rpmprefix@@tool_target@-binutils Requires: @rpmprefix@@tool_target@-sys-root Requires: @rpmprefix@@tool_target@-w32api-sys-root %if %build_newlib -Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release} +Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{newlib_release} %endif %if %build_gcj @@ -84,7 +85,7 @@ BuildRequires: zlib-devel # Building gnat requires gnat # This really isn't available until RedHat 8.0. How to conditionalize this? BuildRequires: gcc-gnat -BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release} +BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-%{newlib_release} %endif %if %build_f95 BuildRequires: gmp-devel diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add index 042b72757e..47543bfafc 100644 --- a/contrib/crossrpms/gcc/target-gcc.add +++ b/contrib/crossrpms/gcc/target-gcc.add @@ -6,7 +6,7 @@ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: @rpmprefix@@tool_target@-binutils -# Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release} +# Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{newlib_release} # License: GPL # %if %build_infos diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add index e40908d21a..f62b59ebfd 100644 --- a/contrib/crossrpms/gcc/target-newlib.add +++ b/contrib/crossrpms/gcc/target-newlib.add @@ -7,9 +7,7 @@ Summary: C Library (newlib) for @tool_target@ Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: @rpmprefix@@tool_target@-libc = %{newlib_version}-%{release} -Obsoletes: @rpmprefix@@tool_target@-libc < %{newlib_version}-%{release} +Release: %{newlib_release} %if %build_infos Requires: @rpmprefix@newlib-common |