From cc85dda0141ea489bef1ee5e9e7d22a0b94309e4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 8 Aug 2007 03:43:09 +0000 Subject: [PATCH] Regenerate. --- .../crossrpms/rtems4.8/tic4x/gcc-sources.add | 2 +- .../tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec | 28 ++++++------------- 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add b/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add index cd6b58887a..33691e2813 100644 --- a/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add +++ b/contrib/crossrpms/rtems4.8/tic4x/gcc-sources.add @@ -16,7 +16,7 @@ Patch0: gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff %endif %if "%{gcc_version}" == "4.2.1" Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: gcc-core-4.2.1-rtems4.8-20070719.diff +Patch0: gcc-core-4.2.1-rtems4.8-20070804.diff %endif %{?_without_sources:NoSource: 0} diff --git a/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec b/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec index 0c614cc4fb..b78277029d 100644 --- a/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec +++ b/contrib/crossrpms/rtems4.8/tic4x/rtems-4.8-tic4x-rtems4.8-gcc.spec @@ -26,7 +26,7 @@ Summary: tic4x-rtems4.8 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 12%{?dist} +Release: 23%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -69,11 +69,15 @@ Patch0: gcc-core-4.1.2-rtems4.8-20070613.diff Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 Patch0: gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff %endif +%if "%{gcc_version}" == "4.2.1" +Source0: ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 +Patch0: gcc-core-4.2.1-rtems4.8-20070804.diff +%endif %{?_without_sources:NoSource: 0} Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.15.0" -Patch50: newlib-1.15.0-rtems4.8-20070413.diff +Patch50: newlib-1.15.0-rtems4.8-20070804.diff %endif %{?_without_sources:NoSource: 50} @@ -365,7 +369,7 @@ GNU cc compiler for tic4x-rtems4.8. %dir %{gcclib}/tic4x-rtems4.8/%{gcc_version}/include %if "%{gcc_version}" > "4.0.3" -%if "tic4x-rtems4.8" != "bfin-rtems4.7" +%if "tic4x-rtems4.8" != "bfin-rtems4.8" %dir %{gcclib}/tic4x-rtems4.8/%{gcc_version}/include/ssp %endif %endif @@ -377,7 +381,7 @@ GNU cc compiler for tic4x-rtems4.8. %{gccexec}/tic4x-rtems4.8/%{gcc_version}/collect2%{_exeext} # ============================================================== -# rtems-4.8-rtems4.7-base-gcc +# rtems-4.8-gcc-common # ============================================================== %package -n rtems-4.8-gcc-common Summary: Base package for rtems gcc and newlib C Library @@ -388,11 +392,6 @@ License: GPL Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -Provides: rtems-4.8-rtems4.7-base-gcc = %{gcc_version}-%{release} -Obsoletes: rtems-4.8-rtems4.7-base-gcc < %{gcc_rpmvers}-%{release} -Provides: rtems-4.8-rtems-base-gcc = %{gcc_version}-%{release} -Obsoletes: rtems-4.8-rtems-base-gcc < %{gcc_rpmvers}-%{release} - %description -n rtems-4.8-gcc-common GCC files that are shared by all targets. @@ -475,17 +474,6 @@ Group: Development/Tools Version: %{newlib_version} License: Distributable -Provides: rtems-4.8-rtems4.7-base-newlib = %{newlib_version}-%{release} -Obsoletes: rtems-4.8-rtems4.7-base-newlib < %{newlib_version}-%{release} -Provides: rtems-4.8-rtems-base-newlib = %{newlib_version}-%{release} -Obsoletes: rtems-4.8-rtems-base-newlib < %{newlib_version}-%{release} - -Provides: rtems-4.8-rtems4.7-base-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.8-rtems4.7-base-libc < %{newlib_version}-%{release} -Provides: rtems-4.8-rtems-base-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.8-rtems-base-libc < %{newlib_version}-%{release} - - Requires(post): /sbin/install-info Requires(preun): /sbin/install-info