[rtems-crossrpms commit] Regenerate.
Ralf Corsepius
ralf at rtems.org
Tue Sep 18 15:18:32 UTC 2012
Module: rtems-crossrpms
Branch: rtems-4-10-branch
Commit: 6189c2e90807b758d91ccf26cddc66e95785396b
Changeset: http://git.rtems.org/rtems-crossrpms/commit/?id=6189c2e90807b758d91ccf26cddc66e95785396b
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Sep 17 13:36:13 2012 +0200
Regenerate.
---
aclocal.m4 | 4 +-
autotools/Makefile.in | 4 +-
autotools/rtems-4.10-autoconf.spec | 6 +-
autotools/rtems-4.10-automake.spec | 6 +-
configure | 178 ++++++++++----------
rtems4.10/arm/Makefile.in | 6 +-
.../arm/rtems-4.10-arm-rtems4.10-binutils.spec | 6 +-
rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec | 45 +++---
rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec | 6 +-
rtems4.10/avr/Makefile.in | 6 +-
.../avr/rtems-4.10-avr-rtems4.10-binutils.spec | 6 +-
rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec | 45 +++---
rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec | 6 +-
rtems4.10/bfin/Makefile.in | 6 +-
.../bfin/rtems-4.10-bfin-rtems4.10-binutils.spec | 6 +-
rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec | 45 +++---
rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec | 6 +-
rtems4.10/h8300/Makefile.in | 6 +-
.../h8300/rtems-4.10-h8300-rtems4.10-binutils.spec | 6 +-
.../h8300/rtems-4.10-h8300-rtems4.10-gcc.spec | 45 +++---
.../h8300/rtems-4.10-h8300-rtems4.10-gdb.spec | 6 +-
rtems4.10/i386/Makefile.in | 6 +-
.../i386/rtems-4.10-i386-rtems4.10-binutils.spec | 6 +-
rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec | 45 +++---
rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec | 6 +-
rtems4.10/lm32/Makefile.in | 6 +-
.../lm32/rtems-4.10-lm32-rtems4.10-binutils.spec | 6 +-
rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec | 45 +++---
rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec | 6 +-
rtems4.10/m32c/Makefile.in | 6 +-
.../m32c/rtems-4.10-m32c-rtems4.10-binutils.spec | 6 +-
rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec | 45 +++---
rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec | 6 +-
rtems4.10/m32r/Makefile.in | 6 +-
.../m32r/rtems-4.10-m32r-rtems4.10-binutils.spec | 6 +-
rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec | 45 +++---
rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec | 6 +-
rtems4.10/m68k/Makefile.in | 6 +-
.../m68k/rtems-4.10-m68k-rtems4.10-binutils.spec | 6 +-
rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec | 45 +++---
rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec | 6 +-
rtems4.10/mips/Makefile.in | 6 +-
.../mips/rtems-4.10-mips-rtems4.10-binutils.spec | 6 +-
rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec | 45 +++---
rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec | 6 +-
rtems4.10/mipstx39/Makefile.in | 2 +-
.../rtems-4.10-mipstx39-rtems4.10-gdb.spec | 6 +-
rtems4.10/powerpc/Makefile.in | 6 +-
.../rtems-4.10-powerpc-rtems4.10-binutils.spec | 6 +-
.../powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec | 45 +++---
.../powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec | 6 +-
rtems4.10/sh/Makefile.in | 6 +-
rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec | 6 +-
rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec | 45 +++---
rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec | 6 +-
rtems4.10/sparc/Makefile.in | 6 +-
.../sparc/rtems-4.10-sparc-rtems4.10-binutils.spec | 6 +-
.../sparc/rtems-4.10-sparc-rtems4.10-gcc.spec | 45 +++---
.../sparc/rtems-4.10-sparc-rtems4.10-gdb.spec | 6 +-
59 files changed, 496 insertions(+), 529 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index 9fea116..38318b1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/autotools/Makefile.in b/autotools/Makefile.in
index 1fe479c..f742b76 100644
--- a/autotools/Makefile.in
+++ b/autotools/Makefile.in
@@ -155,14 +155,14 @@ MKSPEC0 = sed \
-e "s/[@]rtems_api[@]/$(rtems_api)/g"
AUTOCONF_VERS = 2.68
-AUTOCONF_RPMREL = 2
+AUTOCONF_RPMREL = 3
AUTOCONF_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/autotools/autoconf.add \
$(top_srcdir)/binutils/rpm-install.add \
$(top_srcdir)/common/clean.add \
$(top_srcdir)/autotools/target-autoconf.add
AUTOMAKE_VERS = 1.11.1
-AUTOMAKE_RPMREL = 2
+AUTOMAKE_RPMREL = 3
AUTOMAKE_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/autotools/automake.add \
$(top_srcdir)/binutils/rpm-install.add \
diff --git a/autotools/rtems-4.10-autoconf.spec b/autotools/rtems-4.10-autoconf.spec
index 9d6d6a0..2909628 100644
--- a/autotools/rtems-4.10-autoconf.spec
+++ b/autotools/rtems-4.10-autoconf.spec
@@ -58,7 +58,7 @@ License: GPL
URL: http://www.gnu.org/software/autoconf
Group: Development/Tools
Version: %{rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -178,8 +178,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/autotools/rtems-4.10-automake.spec b/autotools/rtems-4.10-automake.spec
index 24ac67e..9176b2b 100644
--- a/autotools/rtems-4.10-automake.spec
+++ b/autotools/rtems-4.10-automake.spec
@@ -57,7 +57,7 @@ URL: http://sources.redhat.com/automake
License: GPL
Group: Development/Tools
Version: %{rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -148,8 +148,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/configure b/configure
index 7ebb0c7..1ee3e98 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for crossrpms 0.20100607.0.
+# Generated by GNU Autoconf 2.69 for crossrpms 0.20100607.0.
#
# Report bugs to <http://www.rtems.org/bugzilla>.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,21 +237,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -330,6 +358,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -451,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -485,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -506,28 +546,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -1109,8 +1129,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1343,9 +1361,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
crossrpms configure 0.20100607.0
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1360,7 +1378,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by crossrpms $as_me 0.20100607.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1851,7 +1869,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2020,7 +2038,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2060,7 +2078,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2111,7 +2129,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2164,7 +2182,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2942,16 +2960,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -3011,28 +3029,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3054,7 +3060,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by crossrpms $as_me 0.20100607.0, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -3107,10 +3113,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
crossrpms config.status 0.20100607.0
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -3190,7 +3196,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/rtems4.10/arm/Makefile.in b/rtems4.10/arm/Makefile.in
index 48cd0d1..b2b7f1e 100644
--- a/rtems4.10/arm/Makefile.in
+++ b/rtems4.10/arm/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
index 820a619..ae8fb87 100644
--- a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
+++ b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-arm-rtems4.10-binutils
Summary: Binutils for target arm-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
index a8bcf46..a866fd4 100644
--- a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
+++ b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: arm-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-arm-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-arm-rtems4.10-binutils
Requires: rtems-4.10-arm-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-arm-rtems4.10-binutils
-# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for arm-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-arm-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for arm-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for arm-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
index 421e6ca..a037ca9 100644
--- a/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
+++ b/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-arm-rtems4.10-gdb
Summary: Gdb for target arm-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/avr/Makefile.in b/rtems4.10/avr/Makefile.in
index 9a52d32..19e80fc 100644
--- a/rtems4.10/avr/Makefile.in
+++ b/rtems4.10/avr/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
index 6b36c54..62de032 100644
--- a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
+++ b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-avr-rtems4.10-binutils
Summary: Binutils for target avr-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
index 4f8a955..6b57452 100644
--- a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
+++ b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: avr-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-avr-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-avr-rtems4.10-binutils
Requires: rtems-4.10-avr-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -356,7 +353,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -579,8 +576,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -636,7 +633,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-avr-rtems4.10-binutils
-# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -654,7 +651,7 @@ Summary: libgcc for avr-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-avr-rtems4.10-gcc-libgcc
@@ -778,7 +775,7 @@ Summary: C Library (newlib) for avr-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -799,7 +796,7 @@ Newlib C Library for avr-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
index b5264d6..709a156 100644
--- a/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
+++ b/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-avr-rtems4.10-gdb
Summary: Gdb for target avr-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/bfin/Makefile.in b/rtems4.10/bfin/Makefile.in
index 20ef14d..6a27d56 100644
--- a/rtems4.10/bfin/Makefile.in
+++ b/rtems4.10/bfin/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.3.1
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS = --disable-infos
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
index a1d8950..ec1e511 100644
--- a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
+++ b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-bfin-rtems4.10-binutils
Summary: Binutils for target bfin-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
index 11a5f32..feaafbe 100644
--- a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
+++ b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: bfin-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-bfin-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-bfin-rtems4.10-binutils
Requires: rtems-4.10-bfin-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-bfin-rtems4.10-binutils
-# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for bfin-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-bfin-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for bfin-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for bfin-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
index 83d37da..064bea9 100644
--- a/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
+++ b/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-bfin-rtems4.10-gdb
Summary: Gdb for target bfin-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -199,8 +199,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/h8300/Makefile.in b/rtems4.10/h8300/Makefile.in
index 5cfb912..f915efe 100644
--- a/rtems4.10/h8300/Makefile.in
+++ b/rtems4.10/h8300/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
index 3eb51b3..b484ebc 100644
--- a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
+++ b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-h8300-rtems4.10-binutils
Summary: Binutils for target h8300-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
index ebad42e..d339048 100644
--- a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
+++ b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: h8300-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-h8300-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-h8300-rtems4.10-binutils
Requires: rtems-4.10-h8300-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-h8300-rtems4.10-binutils
-# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for h8300-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-h8300-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for h8300-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for h8300-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
index 6a6d842..f9d8d48 100644
--- a/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
+++ b/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-h8300-rtems4.10-gdb
Summary: Gdb for target h8300-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,8 +210,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/i386/Makefile.in b/rtems4.10/i386/Makefile.in
index c0681ee..c27e432 100644
--- a/rtems4.10/i386/Makefile.in
+++ b/rtems4.10/i386/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
index 801d125..f5afc9e 100644
--- a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
+++ b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-i386-rtems4.10-binutils
Summary: Binutils for target i386-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
index b7ae80a..773e417 100644
--- a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
+++ b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: i386-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-i386-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-i386-rtems4.10-binutils
Requires: rtems-4.10-i386-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-i386-rtems4.10-binutils
-# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for i386-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-i386-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for i386-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for i386-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
index e8c9584..91ea84d 100644
--- a/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
+++ b/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-i386-rtems4.10-gdb
Summary: Gdb for target i386-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/lm32/Makefile.in b/rtems4.10/lm32/Makefile.in
index 00a7c66..2010578 100644
--- a/rtems4.10/lm32/Makefile.in
+++ b/rtems4.10/lm32/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
index b5d9305..2be86b8 100644
--- a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
+++ b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-lm32-rtems4.10-binutils
Summary: Binutils for target lm32-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
index 8d7b9d1..8bc5ada 100644
--- a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
+++ b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: lm32-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-lm32-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-lm32-rtems4.10-binutils
Requires: rtems-4.10-lm32-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-lm32-rtems4.10-binutils
-# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for lm32-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-lm32-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for lm32-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for lm32-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
index f9ac6c0..92fcd2f 100644
--- a/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
+++ b/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-lm32-rtems4.10-gdb
Summary: Gdb for target lm32-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,8 +210,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m32c/Makefile.in b/rtems4.10/m32c/Makefile.in
index 58a5127..01936b7 100644
--- a/rtems4.10/m32c/Makefile.in
+++ b/rtems4.10/m32c/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
index c46edc2..8eff978 100644
--- a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
+++ b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-m32c-rtems4.10-binutils
Summary: Binutils for target m32c-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
index ef85f70..29310e5 100644
--- a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
+++ b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m32c-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-m32c-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m32c-rtems4.10-binutils
Requires: rtems-4.10-m32c-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -356,7 +353,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -579,8 +576,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -636,7 +633,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m32c-rtems4.10-binutils
-# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -654,7 +651,7 @@ Summary: libgcc for m32c-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-m32c-rtems4.10-gcc-libgcc
@@ -779,7 +776,7 @@ Summary: C Library (newlib) for m32c-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -800,7 +797,7 @@ Newlib C Library for m32c-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
index 47d6a13..7ca3c0f 100644
--- a/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
+++ b/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-m32c-rtems4.10-gdb
Summary: Gdb for target m32c-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,8 +210,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m32r/Makefile.in b/rtems4.10/m32r/Makefile.in
index 43e004d..e605480 100644
--- a/rtems4.10/m32r/Makefile.in
+++ b/rtems4.10/m32r/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
index 8ce1f18..0d6701a 100644
--- a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
+++ b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-m32r-rtems4.10-binutils
Summary: Binutils for target m32r-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
index 8611fde..939f255 100644
--- a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
+++ b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m32r-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-m32r-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m32r-rtems4.10-binutils
Requires: rtems-4.10-m32r-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -356,7 +353,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -579,8 +576,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -636,7 +633,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m32r-rtems4.10-binutils
-# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -654,7 +651,7 @@ Summary: libgcc for m32r-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-m32r-rtems4.10-gcc-libgcc
@@ -779,7 +776,7 @@ Summary: C Library (newlib) for m32r-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -800,7 +797,7 @@ Newlib C Library for m32r-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
index 3213569..60595e3 100644
--- a/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
+++ b/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-m32r-rtems4.10-gdb
Summary: Gdb for target m32r-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m68k/Makefile.in b/rtems4.10/m68k/Makefile.in
index 47c7a8c..186ba23 100644
--- a/rtems4.10/m68k/Makefile.in
+++ b/rtems4.10/m68k/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
index 0243f11..376a400 100644
--- a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
+++ b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-m68k-rtems4.10-binutils
Summary: Binutils for target m68k-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
index 05e253d..f5ca165 100644
--- a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
+++ b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: m68k-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-m68k-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-m68k-rtems4.10-binutils
Requires: rtems-4.10-m68k-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-m68k-rtems4.10-binutils
-# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for m68k-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-m68k-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for m68k-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for m68k-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
index 2708f30..e4a1ccc 100644
--- a/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
+++ b/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-m68k-rtems4.10-gdb
Summary: Gdb for target m68k-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/mips/Makefile.in b/rtems4.10/mips/Makefile.in
index c1c087c..ddec465 100644
--- a/rtems4.10/mips/Makefile.in
+++ b/rtems4.10/mips/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
index c98a9d8..3f284eb 100644
--- a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
+++ b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-mips-rtems4.10-binutils
Summary: Binutils for target mips-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
index b723d97..ac1ba39 100644
--- a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
+++ b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: mips-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-mips-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-mips-rtems4.10-binutils
Requires: rtems-4.10-mips-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-mips-rtems4.10-binutils
-# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for mips-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-mips-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for mips-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for mips-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
index caa2ac3..7221fbc 100644
--- a/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
+++ b/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-mips-rtems4.10-gdb
Summary: Gdb for target mips-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/mipstx39/Makefile.in b/rtems4.10/mipstx39/Makefile.in
index 7c1fdf8..4d9195f 100644
--- a/rtems4.10/mipstx39/Makefile.in
+++ b/rtems4.10/mipstx39/Makefile.in
@@ -159,7 +159,7 @@ MKSPEC0 = sed \
# We only want a gdb with a tx39 simulator in it. We share the other tools
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec b/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
index 3d9df4f..6cb5720 100644
--- a/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
+++ b/rtems4.10/mipstx39/rtems-4.10-mipstx39-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-mipstx39-rtems4.10-gdb
Summary: Gdb for target mipstx39-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,8 +210,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/powerpc/Makefile.in b/rtems4.10/powerpc/Makefile.in
index b7b9133..9c66749 100644
--- a/rtems4.10/powerpc/Makefile.in
+++ b/rtems4.10/powerpc/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
index ba0778a..70707be 100644
--- a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
+++ b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-powerpc-rtems4.10-binutils
Summary: Binutils for target powerpc-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
index 865fddc..f320bcc 100644
--- a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
+++ b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: powerpc-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-powerpc-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-powerpc-rtems4.10-binutils
Requires: rtems-4.10-powerpc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-powerpc-rtems4.10-binutils
-# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for powerpc-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-powerpc-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for powerpc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for powerpc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
index 5f8f40b..858a4d0 100644
--- a/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
+++ b/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-powerpc-rtems4.10-gdb
Summary: Gdb for target powerpc-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -211,8 +211,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/sh/Makefile.in b/rtems4.10/sh/Makefile.in
index 92f3db2..b6916c0 100644
--- a/rtems4.10/sh/Makefile.in
+++ b/rtems4.10/sh/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
index a421bff..6591964 100644
--- a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
+++ b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-sh-rtems4.10-binutils
Summary: Binutils for target sh-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
index 9f38829..5d57986 100644
--- a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
+++ b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: sh-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-sh-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-sh-rtems4.10-binutils
Requires: rtems-4.10-sh-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-sh-rtems4.10-binutils
-# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for sh-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-sh-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for sh-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for sh-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
index ee7a661..aa51634 100644
--- a/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
+++ b/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-sh-rtems4.10-gdb
Summary: Gdb for target sh-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -206,8 +206,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/sparc/Makefile.in b/rtems4.10/sparc/Makefile.in
index 930c474..ce1c568 100644
--- a/rtems4.10/sparc/Makefile.in
+++ b/rtems4.10/sparc/Makefile.in
@@ -164,7 +164,7 @@ MKSPEC0 = sed \
BINUTILS_VERS = 2.20.1
BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 3
+BINUTILS_RPMREL = 4
BINUTILS_OPTS =
BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/binutils.add \
@@ -177,7 +177,7 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/binutils/base-binutils.add
GCC_VERS = 4.4.7
GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 1
+GCC_RPMREL = 2
NEWLIB_VERS = 1.18.0
NEWLIB_PKGVERS = $(NEWLIB_VERS)
NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 28`
@@ -197,7 +197,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gcc/base-newlib.add
GDB_VERS = 7.2
GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 2
+GDB_RPMREL = 3
GDB_OPTS =
GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
index 176cfc5..abed68e 100644
--- a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
+++ b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-binutils.spec
@@ -53,7 +53,7 @@ Name: rtems-4.10-sparc-rtems4.10-binutils
Summary: Binutils for target sparc-rtems4.10
Group: Development/Tools
Version: %{binutils_rpmvers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -177,8 +177,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
diff --git a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
index b41ef1c..62f8303 100644
--- a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
+++ b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec
@@ -58,7 +58,7 @@ Summary: sparc-rtems4.10 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)
@@ -95,7 +95,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if 0%{?fc18}
%global mpc_provided 0.9
%global mpfr_provided 3.1.0
-%global gmp_provided 5.0.2
+%global gmp_provided 5.0.4
%endif
%if 0%{?fc17}
@@ -105,19 +105,13 @@ BuildRequires: %{_host_rpmprefix}gcc
%endif
%if 0%{?fc16}
-%global mpc_provided 0.8.3
-%global mpfr_provided 3.0.0
-%global gmp_provided 4.3.2
-%endif
-
-%if 0%{?fc15}
-%global mpc_provided 0.8.3
+%global mpc_provided 0.9
%global mpfr_provided 3.0.0
%global gmp_provided 4.3.2
%endif
%if 0%{?el6}
-%global mpc_provided %{nil}
+%global mpc_provided 0.8
%global mpfr_provided 2.4.1
%global gmp_provided 4.3.1
%endif
@@ -128,6 +122,12 @@ BuildRequires: %{_host_rpmprefix}gcc
%global gmp_provided 4.1.4
%endif
+%if 0%{?suse12_2}
+%global mpc_provided 0.8.2
+%global mpfr_provided 3.1.0
+%global gmp_provided 5.0.5
+%endif
+
%if 0%{?suse12_1}
%global mpc_provided 0.8.2
%global mpfr_provided 3.0.1
@@ -182,6 +182,7 @@ BuildRequires: %{_host_rpmprefix}gcc
%if %{defined mpc_required}
%if "%{mpc_provided}" >= "%{mpc_required}"
%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}}
+%{?el6:BuildRequires: libmpc-devel >= %{mpc_required}}
%{?suse:BuildRequires: mpc-devel >= %{mpc_required}}
%if "%{_build}" != "%{_host}"
BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required}
@@ -216,13 +217,9 @@ BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required}
%if %{defined cloog_required}
-%{?fc18:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc17:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required}
+%{?fedora:BuildRequires: cloog-ppl-devel >= %cloog_required}
%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required}
-%{?suse12_1:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
-%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
+%{?suse:BuildRequires: cloog-devel >= %cloog_required, ppl-devel}
%endif
@@ -251,7 +248,7 @@ BuildRequires: rtems-4.10-sparc-rtems4.10-binutils
Requires: rtems-4.10-gcc-common
Requires: rtems-4.10-sparc-rtems4.10-binutils
Requires: rtems-4.10-sparc-rtems4.10-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
%if "%{gcc_version}" >= "4.5.0"
BuildRequires: zlib-devel
@@ -370,7 +367,7 @@ cd ..
ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
%endif
-echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-29%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-2%{?dist}/newlib-%{newlib_version}-30%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
# Fix timestamps
@@ -594,8 +591,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
@@ -651,7 +648,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
# Group: Development/Tools
# Version: %{gcc_rpmvers}
# Requires: rtems-4.10-sparc-rtems4.10-binutils
-# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+# Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
# License: GPL
# %if %build_infos
@@ -669,7 +666,7 @@ Summary: libgcc for sparc-rtems4.10-gcc
Group: Development/Tools
Version: %{gcc_rpmvers}
%{?_with_noarch_subpackages:BuildArch: noarch}
-Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-29%{?dist}
+Requires: rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-30%{?dist}
License: GPL
%description -n rtems-4.10-sparc-rtems4.10-gcc-libgcc
@@ -854,7 +851,7 @@ Summary: C Library (newlib) for sparc-rtems4.10
Group: Development/Tools
License: Distributable
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
Requires: rtems-4.10-newlib-common
@@ -875,7 +872,7 @@ Newlib C Library for sparc-rtems4.10.
Summary: Base package for RTEMS newlib C Library
Group: Development/Tools
Version: %{newlib_version}
-Release: 29%{?dist}
+Release: 30%{?dist}
%{?_with_noarch_subpackages:BuildArch: noarch}
License: Distributable
diff --git a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
index 05a2e1d..feab36b 100644
--- a/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
+++ b/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gdb.spec
@@ -52,7 +52,7 @@ Name: rtems-4.10-sparc-rtems4.10-gdb
Summary: Gdb for target sparc-rtems4.10
Group: Development/Tools
Version: %{gdb_rpmvers}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPL/LGPL
URL: http://sources.redhat.com/gdb
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -210,8 +210,8 @@ case $a in
esac
done
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
- -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
+sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
+ -e 's,^\s*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
< os_install_post~ > os_install_post
%define __os_install_post . ./os_install_post
More information about the vc
mailing list