[rtems-crossrpms commit] Bump GCC_RPMREL.

Ralf Corsepius ralf at rtems.org
Mon Apr 23 07:21:20 UTC 2012 

Module:    rtems-crossrpms
Branch:    master
Commit:    2c8dcfaf32ad3ed94e42ce768d4d845964544c1b
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=2c8dcfaf32ad3ed94e42ce768d4d845964544c1b

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Mon Apr 23 02:11:48 2012 -0500

Bump GCC_RPMREL.

---

 rtems4.11/m68k/Makefile.am                        |    2 +-
 rtems4.11/m68k/Makefile.in                        |    2 +-
 rtems4.11/m68k/gcc-sources.add                    |    7 ++++---
 rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec |   21 +++++++++++----------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/rtems4.11/m68k/Makefile.am b/rtems4.11/m68k/Makefile.am
index 8fad841..6f06eb9 100644
--- a/rtems4.11/m68k/Makefile.am
+++ b/rtems4.11/m68k/Makefile.am
@@ -13,7 +13,7 @@ BINUTILS_OPTS +=
 
 GCC_VERS = 4.7.0
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 3
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 5`
diff --git a/rtems4.11/m68k/Makefile.in b/rtems4.11/m68k/Makefile.in
index eba4297..6fc1af5 100644
--- a/rtems4.11/m68k/Makefile.in
+++ b/rtems4.11/m68k/Makefile.in
@@ -200,7 +200,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/base-binutils.add
 GCC_VERS = 4.7.0
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 2
+GCC_RPMREL = 3
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
 NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 5`
diff --git a/rtems4.11/m68k/gcc-sources.add b/rtems4.11/m68k/gcc-sources.add
index 75fc6eb..9fe1be5 100644
--- a/rtems4.11/m68k/gcc-sources.add
+++ b/rtems4.11/m68k/gcc-sources.add
@@ -1,6 +1,7 @@
 %if "%{gcc_version}" == "4.7.0"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -49,6 +50,6 @@ Source5:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-objc-%{gcc_pkgvers}.ta
 %if %build_newlib
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20120328.diff
+Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20120419.diff
 %endif
 %endif
diff --git a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
index 3abadba..fd3947b 100644
--- a/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
+++ b/rtems4.11/m68k/rtems-4.11-m68k-rtems4.11-gcc.spec
@@ -58,7 +58,7 @@ Summary:      	m68k-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	2%{?dist}
+Release:      	3%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -252,7 +252,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}-7%{?dist}
+Requires:	rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-8%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -265,8 +265,9 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %global _gcclibdir %{_prefix}/lib
 
 %if "%{gcc_version}" == "4.7.0"
-Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120322.diff
+# Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-%{gcc_pkgvers}.tar.bz2
+Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}.tar.%{?el5:bz2}%{!?el5:xz}
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-%{gcc_pkgvers}-rtems4.11-20120419.diff
 %endif
 %if "%{gcc_version}" == "4.6.3"
 Source0:	ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
@@ -296,7 +297,7 @@ Patch1:		ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-g++-4.5.3-rtems4.11-2011
 %endif
 %if "%{newlib_version}" == "1.20.0"
 Source50:	ftp://sourceware.org/pub/newlib/newlib-1.20.0.tar.gz
-Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20120328.diff
+Patch50:	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/newlib-1.20.0-rtems4.11-20120419.diff
 %endif
 
 %if 0%{?_build_mpfr}
@@ -380,7 +381,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-7%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-3%{?dist}/newlib-%{newlib_version}-8%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -665,7 +666,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}-7%{?dist}
+# Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-8%{?dist}
 # License:	GPL
 
 # %if %build_infos
@@ -683,7 +684,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}-7%{?dist}
+Requires:       rtems-4.11-m68k-rtems4.11-newlib = %{newlib_version}-8%{?dist}
 License:	GPL
 
 %description -n rtems-4.11-m68k-rtems4.11-gcc-libgcc
@@ -868,7 +869,7 @@ Summary:      	C Library (newlib) for m68k-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-Release:        7%{?dist}
+Release:        8%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
@@ -889,7 +890,7 @@ Newlib C Library for m68k-rtems4.11.
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
-Release:        7%{?dist}
+Release:        8%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	Distributable

More information about the vc mailing list