diff options
Diffstat (limited to 'contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec')
| -rw-r--r-- | contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec index d9a5f01bc1..bfbcaadfc5 100644 --- a/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec +++ b/contrib/crossrpms/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec @@ -46,7 +46,7 @@ %endif -%define gcc_pkgvers 4.6.1-RC-20110620 +%define gcc_pkgvers 4.6.1 %define gcc_version 4.6.1 %define gcc_rpmvers %{expand:%(echo "4.6.1" | tr - _ )} @@ -58,7 +58,7 @@ Summary: m68k-rtems4.11 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -245,7 +245,7 @@ BuildRequires: rtems-4.11-m68k-rtems4.11-binutils Requires: rtems-4.11-gcc-common Requires: rtems-4.11-m68k-rtems4.11-binutils Requires: rtems-4.11-m68k-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-11%{?dist} +Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-12%{?dist} %if "%{gcc_version}" >= "4.5.0" BuildRequires: zlib-devel @@ -258,8 +258,7 @@ BuildRequires: %{_host_rpmprefix}zlib-devel %global _gcclibdir %{_prefix}/lib %if "%{gcc_version}" == "4.6.1" -# Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.6.1-rtems4.11-20110621.diff %endif %if "%{gcc_version}" == "4.6.0" @@ -276,8 +275,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-core-4.5.2-rtems4 %endif %if "%{gcc_version}" == "4.6.1" -#Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -Source1: ftp://gcc.gnu.org/pub/gcc/snapshots/gcc-%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 +Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 %endif %if "%{gcc_version}" == "4.6.0" Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 @@ -377,7 +375,7 @@ cd .. ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf %endif -echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-11%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE +echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-12%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE # Fix timestamps @@ -654,7 +652,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.11-m68k-rtems4.11-binutils -# Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-11%{?dist} +# Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-12%{?dist} # License: GPL # %if %build_infos @@ -672,7 +670,7 @@ Summary: libgcc for m68k-rtems4.11-gcc Group: Development/Tools Version: %{gcc_rpmvers} %{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-11%{?dist} +Requires: rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-12%{?dist} License: GPL %description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc @@ -851,7 +849,7 @@ Summary: C Library (newlib) for m68k-rtems4.11 Group: Development/Tools License: Distributable Version: %{newlib_version} -Release: 11%{?dist} +Release: 12%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} Requires: rtems-4.11-newlib-common @@ -872,7 +870,7 @@ Newlib C Library for m68k-rtems4.11. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} -Release: 11%{?dist} +Release: 12%{?dist} %{?_with_noarch_subpackages:BuildArch: noarch} License: Distributable |