diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-02-07 09:22:02 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-02-07 09:22:02 +0000 |
commit | bdf53bd4c8b703aad05b02d753511e8c625716ae (patch) | |
tree | 50a6d92b631094aacb7fc65940265856480700a8 /contrib/crossrpms | |
parent | Add NEWLIB_PKGVERS, NEWLIB_RPMREL. (diff) | |
download | rtems-bdf53bd4c8b703aad05b02d753511e8c625716ae.tar.bz2 |
Regenerate.
Diffstat (limited to 'contrib/crossrpms')
10 files changed, 89 insertions, 145 deletions
diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec index 228d1dec1d..d8dac7f89e 100644 --- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: arm-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-arm-rtems4.9-gcc +BuildRequires: rtems-4.9-arm-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-arm-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-arm-rtems4.9-binutils -Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-arm-rtems4.9-binutils -# Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-arm-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-arm-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-arm-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-arm-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for arm-rtems4.9. %{gccexec}/arm-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/arm-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/arm-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/arm-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for arm-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-arm-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-arm-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for arm-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec index 1aaca7f2f2..ebc607af04 100644 --- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: avr-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-avr-rtems4.9-gcc +BuildRequires: rtems-4.9-avr-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-avr-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-avr-rtems4.9-binutils -Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -120,7 +119,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20081 Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -422,7 +421,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-avr-rtems4.9-binutils -# Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -539,9 +538,7 @@ Summary: C Library (newlib) for avr-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-avr-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-avr-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -561,6 +558,7 @@ Newlib C Library for avr-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec index 6e25385256..8c31a45467 100644 --- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: bfin-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-bfin-rtems4.9-gcc +BuildRequires: rtems-4.9-bfin-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-bfin-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-bfin-rtems4.9-binutils -Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-bfin-rtems4.9-binutils -# Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-bfin-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-bfin-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-bfin-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-bfin-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for bfin-rtems4.9. %{gccexec}/bfin-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/bfin-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/bfin-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/bfin-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for bfin-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-bfin-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-bfin-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for bfin-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec index adabc71d98..d7c7401ea7 100644 --- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: h8300-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-h8300-rtems4.9-gcc +BuildRequires: rtems-4.9-h8300-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-h8300-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-h8300-rtems4.9-binutils -Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-h8300-rtems4.9-binutils -# Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-h8300-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-h8300-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-h8300-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-h8300-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for h8300-rtems4.9. %{gccexec}/h8300-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/h8300-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/h8300-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/h8300-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for h8300-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-h8300-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-h8300-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for h8300-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec index eeec036c42..f635fb7b1f 100644 --- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: i386-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-i386-rtems4.9-gcc +BuildRequires: rtems-4.9-i386-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-i386-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-i386-rtems4.9-binutils -Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-i386-rtems4.9-binutils -# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-i386-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-i386-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-i386-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-i386-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for i386-rtems4.9. %{gccexec}/i386-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/i386-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/i386-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/i386-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for i386-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-i386-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-i386-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for i386-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec index 273755dedf..2857e282e9 100644 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: m68k-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-m68k-rtems4.9-gcc +BuildRequires: rtems-4.9-m68k-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-m68k-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-m68k-rtems4.9-binutils -Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-m68k-rtems4.9-binutils -# Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-m68k-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-m68k-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-m68k-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-m68k-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for m68k-rtems4.9. %{gccexec}/m68k-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/m68k-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/m68k-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/m68k-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for m68k-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-m68k-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-m68k-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for m68k-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec index 80596e17a7..779b5cec4a 100644 --- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: mips-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-mips-rtems4.9-gcc +BuildRequires: rtems-4.9-mips-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-mips-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-mips-rtems4.9-binutils -Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-mips-rtems4.9-binutils -# Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-mips-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-mips-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-mips-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-mips-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for mips-rtems4.9. %{gccexec}/mips-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/mips-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/mips-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/mips-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for mips-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-mips-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-mips-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for mips-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec index a1e2f2fa03..05fce0d660 100644 --- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: powerpc-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc +BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-powerpc-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-powerpc-rtems4.9-binutils -Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-powerpc-rtems4.9-binutils -# Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-powerpc-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-powerpc-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for powerpc-rtems4.9. %{gccexec}/powerpc-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/powerpc-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for powerpc-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-powerpc-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-powerpc-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for powerpc-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec index dd63a9caee..30e4ec0898 100644 --- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: sh-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sh-rtems4.9-gcc +BuildRequires: rtems-4.9-sh-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-sh-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-sh-rtems4.9-binutils -Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-sh-rtems4.9-binutils -# Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sh-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-sh-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-sh-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-sh-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for sh-rtems4.9. %{gccexec}/sh-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/sh-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/sh-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/sh-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for sh-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-sh-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-sh-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for sh-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec index c6d33a4e58..c65439fb1c 100644 --- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec +++ b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec @@ -50,8 +50,8 @@ %define gcc_version 4.3.2 %define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} +%define newlib_pkgvers 1.16.0 %define newlib_version 1.16.0 -%define gccnewlib_version gcc%{gcc_version}newlib%{newlib_version} %define mpfr_version 2.3.1 @@ -60,7 +60,7 @@ Summary: sparc-rtems4.9 gcc Group: Development/Tools Version: %{gcc_rpmvers} -Release: 19%{?dist} +Release: 20%{?dist} License: GPL URL: http://gcc.gnu.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -83,12 +83,11 @@ BuildRequires: mpfr-devel >= 2.3.0 %endif # These distros ship an insufficient mpfr %{?el4:%define _build_mpfr 1} -%{?suse10_2:%define _build_mpfr 1} %{?suse10_3:%define _build_mpfr 1} %endif %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sparc-rtems4.9-gcc +BuildRequires: rtems-4.9-sparc-rtems4.9-gcc = %{gcc_rpmvers} %endif %if "%{gcc_version}" >= "4.2.0" @@ -101,7 +100,7 @@ BuildRequires: rtems-4.9-sparc-rtems4.9-binutils Requires: rtems-4.9-gcc-common Requires: rtems-4.9-sparc-rtems4.9-binutils -Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-%{release} +Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-20%{?dist} %if "%{gcc_version}" >= "3.4" @@ -128,7 +127,7 @@ Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgve Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz %if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20081203.diff +Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090207.diff %endif %{?_without_sources:NoSource: 50} @@ -433,7 +432,7 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ # Group: Development/Tools # Version: %{gcc_rpmvers} # Requires: rtems-4.9-sparc-rtems4.9-binutils -# Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-%{release} +# Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-20%{?dist} # License: GPL # %if %build_infos @@ -549,7 +548,7 @@ Version: %{gcc_rpmvers} License: GPL %if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sparc-rtems4.9-gcc-c++ +BuildRequires: rtems-4.9-sparc-rtems4.9-gcc-c++ = %{gcc_rpmvers} %endif Provides: rtems-4.9-sparc-rtems4.9-c++ = %{gcc_rpmvers}-%{release} Obsoletes: rtems-4.9-sparc-rtems4.9-c++ < %{gcc_rpmvers}-%{release} @@ -573,11 +572,7 @@ GCC c++ compiler for sparc-rtems4.9. %{gccexec}/sparc-rtems4.9/%{gcc_version}/cc1plus%{_exeext} %dir %{gcclib}/sparc-rtems4.9/%{gcc_version}/include -%if "%{gcc_version}" >= "3.2" %{gcclib}/sparc-rtems4.9/%{gcc_version}/include/c++ -%else -%{gcclib}/sparc-rtems4.9/%{gcc_version}/include/g++ -%endif @@ -589,9 +584,7 @@ Summary: C Library (newlib) for sparc-rtems4.9 Group: Development/Tools License: Distributable Version: %{newlib_version} - -Provides: rtems-4.9-sparc-rtems4.9-libc = %{newlib_version}-%{release} -Obsoletes: rtems-4.9-sparc-rtems4.9-libc < %{newlib_version}-%{release} +Release: 20%{?dist} Requires: rtems-4.9-newlib-common @@ -611,6 +604,7 @@ Newlib C Library for sparc-rtems4.9. Summary: Base package for RTEMS newlib C Library Group: Development/Tools Version: %{newlib_version} +Release: 20%{?dist} License: Distributable Requires(post): /sbin/install-info |