[rtems-crossrpms commit] Regenerate.

Ralf Corsepius ralf at rtems.org
Thu May 30 03:28:28 UTC 2013


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

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Tue May 28 08:38:03 2013 +0200

Regenerate.

---

 rtems4.11/arm/Makefile.in                          |   12 +-
 ...spec => rtems-4.11-arm-rtems4.11-binutils.spec} |   54 +++---
 ...-gcc.spec => rtems-4.11-arm-rtems4.11-gcc.spec} |  211 ++++++++++---------
 ...-gdb.spec => rtems-4.11-arm-rtems4.11-gdb.spec} |   41 ++--
 .../arm/rtems-4.11-arm-rtemseabi4.11-cpukit.spec   |  157 ---------------
 5 files changed, 167 insertions(+), 308 deletions(-)

diff --git a/rtems4.11/arm/Makefile.in b/rtems4.11/arm/Makefile.in
index 19467ca..c31ca9b 100644
--- a/rtems4.11/arm/Makefile.in
+++ b/rtems4.11/arm/Makefile.in
@@ -201,7 +201,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-TARGET = arm-rtemseabi4.11
+TARGET = arm-rtems4.11
 noinst_DATA = @rpmprefix@$(TARGET)-binutils.spec \
 	@rpmprefix@$(TARGET)-gcc.spec @rpmprefix@$(TARGET)-gdb.spec
 CLEANFILES = $(TARGET)-binutils.spec.in $(am__append_1) \
@@ -225,7 +225,7 @@ MKSPEC0 = sed \
 
 BINUTILS_VERS = 2.23.2
 BINUTILS_PKGVERS = $(BINUTILS_VERS)
-BINUTILS_RPMREL = 2
+BINUTILS_RPMREL = 3
 BINUTILS_OPTS =
 BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/binutils/binutils.add \
@@ -236,12 +236,12 @@ BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/common/clean.add \
 	$(top_srcdir)/binutils/target-binutils.add \
 	$(top_srcdir)/binutils/base-binutils.add
-GCC_VERS = 4.7.2
+GCC_VERS = 4.8.0
 GCC_PKGVERS = $(GCC_VERS)
-GCC_RPMREL = 6
+GCC_RPMREL = 1
 NEWLIB_VERS = 1.20.0
 NEWLIB_PKGVERS = $(NEWLIB_VERS)
-NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 16`
+NEWLIB_RPMREL = `expr $(GCC_RPMREL) + 21`
 GCC_OPTS = --languages=c --newlib --languages=cxx
 GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/gccnewlib.add $(top_srcdir)/gcc/prep.add \
@@ -259,7 +259,7 @@ GCC_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gcc/base-newlib.add
 GDB_VERS = 7.6
 GDB_PKGVERS = $(GDB_VERS)
-GDB_RPMREL = 1
+GDB_RPMREL = 2
 GDB_OPTS =
 GDB_SUBPACKAGES = $(top_srcdir)/common/common.add \
 	$(top_srcdir)/gdb/gdb.add $(top_srcdir)/gdb/prep.add \
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
similarity index 83%
rename from rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
rename to rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
index b57b69d..844eedb 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-binutils.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-binutils.spec
@@ -50,11 +50,11 @@
 %define binutils_version 2.23.2
 %define binutils_rpmvers %{expand:%(echo "2.23.2" | tr - _ )}
 
-Name:		rtems-4.11-arm-rtemseabi4.11-binutils
-Summary:	Binutils for target arm-rtemseabi4.11
+Name:		rtems-4.11-arm-rtems4.11-binutils
+Summary:	Binutils for target arm-rtems4.11
 Group:		Development/Tools
 Version:	%{binutils_rpmvers}
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL/LGPL
 URL: 		http://sourceware.org/binutils
 %{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
@@ -73,6 +73,8 @@ BuildRequires:	flex
 BuildRequires:	bison
 
 Requires:	rtems-4.11-binutils-common
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-binutils < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-binutils = %{version}-%{release}
 
 Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2
 %if "%{binutils_version}" == "2.23.2"
@@ -80,7 +82,7 @@ Patch0:  ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/binutils-2.23.2-rtems4.11-20
 %endif
 
 %description
-Cross binutils for target arm-rtemseabi4.11
+Cross binutils for target arm-rtems4.11
 %prep
 %setup -q -c -T -n %{name}-%{version}
 
@@ -99,7 +101,7 @@ cd ..
   CFLAGS="$RPM_OPT_FLAGS" \
   ../binutils-%{binutils_pkgvers}/configure \
     --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
+    --target=arm-rtems4.11 \
     --verbose --disable-nls \
     --without-included-gettext \
     --disable-win32-registry \
@@ -142,17 +144,17 @@ cd ..
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
 # manpages without corresponding tools
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-dlltool%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-dlltool*
+  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-dlltool%{_exeext}; then 
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-dlltool*
   fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-nlmconv%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-nlmconv*
+  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-nlmconv%{_exeext}; then 
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-nlmconv*
   fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-windres%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-windres*
+  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-windres%{_exeext}; then 
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-windres*
   fi
-  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtemseabi4.11-windmc%{_exeext}; then 
-    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtemseabi4.11-windmc*
+  if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.11-windmc%{_exeext}; then 
+    rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.11-windmc*
   fi
 
   cd ..
@@ -189,36 +191,36 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
   rm -rf $RPM_BUILD_ROOT
 
 # ==============================================================
-# arm-rtemseabi4.11-binutils
+# arm-rtems4.11-binutils
 # ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-binutils
-# Summary:      rtems binutils for arm-rtemseabi4.11
+# %package -n rtems-4.11-arm-rtems4.11-binutils
+# Summary:      rtems binutils for arm-rtems4.11
 # Group: Development/Tools
 # %if %build_infos
 # Requires: rtems-4.11-binutils-common
 # %endif
 
-%description -n rtems-4.11-arm-rtemseabi4.11-binutils
-GNU binutils targetting arm-rtemseabi4.11.
+%description -n rtems-4.11-arm-rtems4.11-binutils
+GNU binutils targetting arm-rtems4.11.
 
-%files -n rtems-4.11-arm-rtemseabi4.11-binutils
+%files -n rtems-4.11-arm-rtems4.11-binutils
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_datarootdir}
 
 %dir %{_mandir}
 %dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-*.1*
+%{_mandir}/man1/arm-rtems4.11-*.1*
 
 %dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-*
+%{_bindir}/arm-rtems4.11-*
 
-%dir %{_exec_prefix}/arm-rtemseabi4.11
-%dir %{_exec_prefix}/arm-rtemseabi4.11/bin
-%{_exec_prefix}/arm-rtemseabi4.11/bin/*
+%dir %{_exec_prefix}/arm-rtems4.11
+%dir %{_exec_prefix}/arm-rtems4.11/bin
+%{_exec_prefix}/arm-rtems4.11/bin/*
 
-%dir %{_exec_prefix}/arm-rtemseabi4.11/lib
-%{_exec_prefix}/arm-rtemseabi4.11/lib/ldscripts
+%dir %{_exec_prefix}/arm-rtems4.11/lib
+%{_exec_prefix}/arm-rtems4.11/lib/ldscripts
 # ==============================================================
 # rtems-4.11-binutils-common
 # ==============================================================
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
similarity index 79%
rename from rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
rename to rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
index 8e2c7d4..09391c0 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gcc.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gcc.spec
@@ -47,19 +47,19 @@
 
 %{?!el5:%global _with_noarch_subpackages 1}
 
-%define gcc_pkgvers 4.7.2
-%define gcc_version 4.7.2
-%define gcc_rpmvers %{expand:%(echo "4.7.2" | tr - _ )}
+%define gcc_pkgvers 4.8.0
+%define gcc_version 4.8.0
+%define gcc_rpmvers %{expand:%(echo "4.8.0" | tr - _ )}
 
 %define newlib_pkgvers		1.20.0
 %define newlib_version		1.20.0
 
-Name:         	rtems-4.11-arm-rtemseabi4.11-gcc
-Summary:      	arm-rtemseabi4.11 gcc
+Name:         	rtems-4.11-arm-rtems4.11-gcc
+Summary:      	arm-rtems4.11 gcc
 
 Group:	      	Development/Tools
 Version:        %{gcc_rpmvers}
-Release:      	6%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://gcc.gnu.org
 %{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
@@ -243,9 +243,9 @@ BuildRequires:  %{_host_rpmprefix}mpfr-devel >= %{mpfr_required}
 %endif
 
 %if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc = %{gcc_rpmvers}
+BuildRequires:  rtems-4.11-arm-rtems4.11-gcc = %{gcc_rpmvers}
 %if "%{gcc_version}" >= "4.8.0"
-BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{gcc_rpmvers}
+BuildRequires:  rtems-4.11-arm-rtems4.11-gcc-c++ = %{gcc_rpmvers}
 %endif
 %endif
 
@@ -254,12 +254,12 @@ BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{gcc_rpmvers}
 BuildRequires:	flex bison
 
 BuildRequires:	%{?suse:makeinfo}%{!?suse:texinfo} >= 4.2
-BuildRequires:	rtems-4.11-arm-rtemseabi4.11-binutils
+BuildRequires:	rtems-4.11-arm-rtems4.11-binutils
 
 Requires:	rtems-4.11-gcc-common
-Requires:	rtems-4.11-arm-rtemseabi4.11-binutils
-Requires:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
-Requires:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:	rtems-4.11-arm-rtems4.11-binutils
+Requires:	rtems-4.11-arm-rtems4.11-gcc-libgcc = %{gcc_rpmvers}-%{release}
+Requires:	rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 
 %if "%{gcc_version}" >= "4.5.0"
 BuildRequires:  zlib-devel
@@ -274,7 +274,7 @@ BuildRequires:  %{_host_rpmprefix}zlib-devel
 %if "%{gcc_version}" == "4.8.0"
 # Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.0/gcc-4.8.0.tar.bz2
 Source0:        ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.0.tar.%{?el5:bz2}%{!?el5:xz}
-Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.0-rtems4.11-20130326.diff
+Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gcc-4.8.0-rtems4.11-20130502.diff
 %endif
 %if "%{gcc_version}" == "4.7.2"
 # Source0:      ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.2/gcc-4.7.2.tar.bz2
@@ -324,8 +324,11 @@ Source62:    ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
 Source63:    http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz
 %endif
 
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-gcc < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-gcc = %{version}-%{release}
+
 %description
-Cross gcc for arm-rtemseabi4.11.
+Cross gcc for arm-rtems4.11.
 
 %prep
 %setup -c -T -n %{name}-%{version}
@@ -389,7 +392,7 @@ cd ..
   ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf
 %endif
 
-echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
+echo "RTEMS gcc-%{gcc_version}-1%{?dist}/newlib-%{newlib_version}-22%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE
 
 
   # Fix timestamps
@@ -422,7 +425,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
     --infodir=%{_infodir} \
     --datadir=%{_datadir} \
     --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
+    --target=arm-rtems4.11 \
     --disable-libstdcxx-pch \
     --with-gnu-as --with-gnu-ld --verbose \
     --with-newlib \
@@ -457,7 +460,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
   make DESTDIR=$RPM_BUILD_ROOT install
   cd ..
 
-  cd build/arm-rtemseabi4.11/newlib
+  cd build/arm-rtems4.11/newlib
   make DESTDIR=$RPM_BUILD_ROOT install-info
   cd ../../..
 
@@ -465,7 +468,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
 # Misplaced header file
   if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
     mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
-      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/
+      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/
   fi
 %endif
 
@@ -480,7 +483,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
 %endif
 
   # We use the version from binutils
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtemseabi4.11-c++filt%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.11-c++filt%{_exeext}
 
 
   # We don't ship info/dir
@@ -491,16 +494,16 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
   rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi*
 
   # Bug in gcc-3.4.0pre
-  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtemseabi4.11-arm-rtemseabi4.11-gcjh%{_exeext}
+  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.11-arm-rtems4.11-gcjh%{_exeext}
 
   # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
   # the fixinclude-install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/install-tools
-  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/install-tools
+  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/install-tools
 
   # Bug in gcc > 4.1.0: Installs an unused, empty directory
-  if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtemseabi4.11/include/bits; then
-    rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtemseabi4.11/include/bits
+  if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.11/include/bits; then
+    rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.11/include/bits
   fi
 
 %if %{with iconv}
@@ -521,7 +524,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
   multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'`
 
   echo "%defattr(-,root,root,-)" > build/files.newlib
-  TGTDIR="%{_exec_prefix}/arm-rtemseabi4.11/lib"
+  TGTDIR="%{_exec_prefix}/arm-rtems4.11/lib"
   for i in $multilibs; do
     case $i in
     \.) echo "%dir ${TGTDIR}" >> build/files.newlib
@@ -533,7 +536,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
 
   rm -f dirs ;
   echo "%defattr(-,root,root,-)" >> dirs
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}"
   for i in $multilibs; do
     case $i in
     \.) ;; # ignore, handled elsewhere
@@ -550,7 +553,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
   cp dirs build/files.g++
   cp dirs build/files.go
 
-  TGTDIR="%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}"
+  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -584,7 +587,7 @@ echo "RTEMS gcc-%{gcc_version}-6%{?dist}/newlib-%{newlib_version}-22%{?dist}" >
     esac
   done
 
-  TGTDIR="%{_exec_prefix}/arm-rtemseabi4.11/lib"
+  TGTDIR="%{_exec_prefix}/arm-rtems4.11/lib"
   f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
   for i in $f; do
     case $i in
@@ -625,16 +628,16 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 #!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/'} | %__find_provides
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/'} | %__find_provides
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 %define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
 
 cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 #!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtemseabi4.11/'} | %__find_requires
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.11/(lib|include|sys-root)' \
+  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.11/'} | %__find_requires
 EOF
 chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
 %define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
@@ -667,89 +670,91 @@ sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
   rm -rf $RPM_BUILD_ROOT
 
 # ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc
+# rtems-4.11-arm-rtems4.11-gcc
 # ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-gcc
-# Summary:        GNU cc compiler for arm-rtemseabi4.11
+# %package -n rtems-4.11-arm-rtems4.11-gcc
+# Summary:        GNU cc compiler for arm-rtems4.11
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
-# Requires:       rtems-4.11-arm-rtemseabi4.11-binutils
-# Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
+# Requires:       rtems-4.11-arm-rtems4.11-binutils
+# Requires:       rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 # License:	GPL
 
 # %if %build_infos
 # Requires:      rtems-4.11-gcc-common
 # %endif
 
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc
-GNU cc compiler for arm-rtemseabi4.11.
+%description -n rtems-4.11-arm-rtems4.11-gcc
+GNU cc compiler for arm-rtems4.11.
 
 # ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
+# rtems-4.11-arm-rtems4.11-gcc-libgcc
 # ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
-Summary:        libgcc for arm-rtemseabi4.11-gcc
+%package -n rtems-4.11-arm-rtems4.11-gcc-libgcc
+Summary:        libgcc for arm-rtems4.11-gcc
 Group:          Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
-Requires:       rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-22%{?dist}
+Requires:       rtems-4.11-arm-rtems4.11-newlib = %{newlib_version}-22%{?dist}
 License:	GPL
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-gcc-libgcc = %{version}-%{release}
 
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc
-libgcc arm-rtemseabi4.11-gcc.
+%description -n rtems-4.11-arm-rtems4.11-gcc-libgcc
+libgcc arm-rtems4.11-gcc.
 
 
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc
+%files -n rtems-4.11-arm-rtems4.11-gcc
 %defattr(-,root,root)
 %dir %{_prefix}
 
 %dir %{_mandir}
 %dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-gcc.1*
-%{_mandir}/man1/arm-rtemseabi4.11-cpp.1*
-%{_mandir}/man1/arm-rtemseabi4.11-gcov.1*
+%{_mandir}/man1/arm-rtems4.11-gcc.1*
+%{_mandir}/man1/arm-rtems4.11-cpp.1*
+%{_mandir}/man1/arm-rtems4.11-gcov.1*
 
 %dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-cpp%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc-%{gcc_version}%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcov%{_exeext}
+%{_bindir}/arm-rtems4.11-cpp%{_exeext}
+%{_bindir}/arm-rtems4.11-gcc%{_exeext}
+%{_bindir}/arm-rtems4.11-gcc-%{gcc_version}%{_exeext}
+%{_bindir}/arm-rtems4.11-gcov%{_exeext}
 %if "%{gcc_version}" < "4.6.0"
-%{_bindir}/arm-rtemseabi4.11-gccbug
+%{_bindir}/arm-rtems4.11-gccbug
 %endif
 %if "%{gcc_version}" >= "4.7.0"
 # FIXME: To ship or not to ship?
-%{_bindir}/arm-rtemseabi4.11-gcc-ar%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc-nm%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-gcc-ranlib%{_exeext}
+%{_bindir}/arm-rtems4.11-gcc-ar%{_exeext}
+%{_bindir}/arm-rtems4.11-gcc-nm%{_exeext}
+%{_bindir}/arm-rtems4.11-gcc-ranlib%{_exeext}
 %endif
 
 %dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/cc1%{_exeext}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/collect2%{_exeext}
+%dir %{_libexecdir}/gcc/arm-rtems4.11
+%dir %{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}
+%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/cc1%{_exeext}
+%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/collect2%{_exeext}
 %if "%{gcc_version}" >= "4.5.0"
-%{?with_lto:%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/lto%{_exeext}}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/lto-wrapper%{_exeext}
+%{?with_lto:%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/lto%{_exeext}}
+%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/lto-wrapper%{_exeext}
 %endif
 
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-libgcc -f build/files.gcc
+%files -n rtems-4.11-arm-rtems4.11-gcc-libgcc -f build/files.gcc
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include
+%dir %{_gcclibdir}/gcc/arm-rtems4.11
+%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}
+%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include
 
 %if "%{gcc_version}" > "4.0.3"
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/ssp
+%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/ssp
 %endif
 
 %if "%{gcc_version}" >= "4.3.0"
-%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include-fixed
+%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include-fixed
 %endif
 
 # ==============================================================
@@ -807,73 +812,77 @@ if [ $1 -eq 0 ]; then
 fi
 
 # ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-gcc-c++
+# rtems-4.11-arm-rtems4.11-gcc-c++
 # ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
-Summary:	GCC c++ compiler for arm-rtemseabi4.11
+%package -n rtems-4.11-arm-rtems4.11-gcc-c++
+Summary:	GCC c++ compiler for arm-rtems4.11
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 License:	GPL
-Requires:       rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
+Requires:       rtems-4.11-arm-rtems4.11-gcc-libstdc++ = %{gcc_rpmvers}-%{release}
 
 %if "%{_build}" != "%{_host}"
-BuildRequires:  rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{gcc_rpmvers}
+BuildRequires:  rtems-4.11-arm-rtems4.11-gcc-c++ = %{gcc_rpmvers}
 %endif
 
 Requires:       rtems-4.11-gcc-common
-Requires:       rtems-4.11-arm-rtemseabi4.11-gcc = %{gcc_rpmvers}-%{release}
+Requires:       rtems-4.11-arm-rtems4.11-gcc = %{gcc_rpmvers}-%{release}
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-gcc-c++ < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-gcc-c++ = %{version}-%{release}
 
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
-GCC c++ compiler for arm-rtemseabi4.11.
+%description -n rtems-4.11-arm-rtems4.11-gcc-c++
+GCC c++ compiler for arm-rtems4.11.
 
 
-%package -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++
-Summary:	libstdc++ for arm-rtemseabi4.11
+%package -n rtems-4.11-arm-rtems4.11-gcc-libstdc++
+Summary:	libstdc++ for arm-rtems4.11
 Group:		Development/Tools
 Version:        %{gcc_rpmvers}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 License:	GPL
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ = %{version}-%{release}
 
-%description -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++
+%description -n rtems-4.11-arm-rtems4.11-gcc-libstdc++
 %{summary}
 
 
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-c++
+%files -n rtems-4.11-arm-rtems4.11-gcc-c++
 %defattr(-,root,root)
 %dir %{_prefix}
 
 %dir %{_mandir}
 %dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-g++.1*
+%{_mandir}/man1/arm-rtems4.11-g++.1*
 
 %dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-c++%{_exeext}
-%{_bindir}/arm-rtemseabi4.11-g++%{_exeext}
+%{_bindir}/arm-rtems4.11-c++%{_exeext}
+%{_bindir}/arm-rtems4.11-g++%{_exeext}
 
 %dir %{_libexecdir}
 %dir %{_libexecdir}/gcc
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11
-%dir %{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%{_libexecdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/cc1plus%{_exeext}
+%dir %{_libexecdir}/gcc/arm-rtems4.11
+%dir %{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}
+%{_libexecdir}/gcc/arm-rtems4.11/%{gcc_version}/cc1plus%{_exeext}
 
 
-%files -n rtems-4.11-arm-rtemseabi4.11-gcc-libstdc++ -f build/files.g++
+%files -n rtems-4.11-arm-rtems4.11-gcc-libstdc++ -f build/files.g++
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_gcclibdir}
 %dir %{_gcclibdir}/gcc
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}
-%dir %{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include
-%{_gcclibdir}/gcc/arm-rtemseabi4.11/%{gcc_version}/include/c++
+%dir %{_gcclibdir}/gcc/arm-rtems4.11
+%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}
+%dir %{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include
+%{_gcclibdir}/gcc/arm-rtems4.11/%{gcc_version}/include/c++
 
 
 
 # ==============================================================
-# rtems-4.11-arm-rtemseabi4.11-newlib
+# rtems-4.11-arm-rtems4.11-newlib
 # ==============================================================
-%package -n rtems-4.11-arm-rtemseabi4.11-newlib
-Summary:      	C Library (newlib) for arm-rtemseabi4.11
+%package -n rtems-4.11-arm-rtems4.11-newlib
+Summary:      	C Library (newlib) for arm-rtems4.11
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
@@ -881,15 +890,17 @@ Release:        22%{?dist}
 %{?_with_noarch_subpackages:BuildArch: noarch}
 
 Requires:	rtems-4.11-newlib-common
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-newlib < %{newlib_version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-newlib = %{newlib_version}-%{release}
 
-%description -n rtems-4.11-arm-rtemseabi4.11-newlib
-Newlib C Library for arm-rtemseabi4.11.
+%description -n rtems-4.11-arm-rtems4.11-newlib
+Newlib C Library for arm-rtems4.11.
 
-%files -n rtems-4.11-arm-rtemseabi4.11-newlib -f build/files.newlib
+%files -n rtems-4.11-arm-rtems4.11-newlib -f build/files.newlib
 %defattr(-,root,root)
 %dir %{_exec_prefix}
-%dir %{_exec_prefix}/arm-rtemseabi4.11
-%{_exec_prefix}/arm-rtemseabi4.11/include
+%dir %{_exec_prefix}/arm-rtems4.11
+%{_exec_prefix}/arm-rtems4.11/include
 
 # ==============================================================
 # rtems-4.11-newlib-common
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec
similarity index 88%
rename from rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec
rename to rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec
index 055f0a8..b2089f0 100644
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-gdb.spec
+++ b/rtems4.11/arm/rtems-4.11-arm-rtems4.11-gdb.spec
@@ -49,11 +49,11 @@
 %define gdb_version 7.6
 %define gdb_rpmvers %{expand:%(echo 7.6 | tr - _)} 
 
-Name:		rtems-4.11-arm-rtemseabi4.11-gdb
-Summary:	Gdb for target arm-rtemseabi4.11
+Name:		rtems-4.11-arm-rtems4.11-gdb
+Summary:	Gdb for target arm-rtems4.11
 Group:		Development/Tools
 Version:	%{gdb_rpmvers}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPL/LGPL
 URL: 		http://sourceware.org/gdb
 %{?el5:BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)}
@@ -99,6 +99,9 @@ BuildRequires:	/sbin/install-info
 Requires:	rtems-4.11-gdb-common
 BuildRequires:	%{?suse:makeinfo}%{!?suse:texinfo}
 
+Obsoletes:	rtems-4.11-arm-rtemseabi4.11-gdb < %{version}-%{release}
+Provides:	rtems-4.11-arm-rtemseabi4.11-gdb = %{version}-%{release}
+
 %if "%{gdb_version}" == "7.6"
 Source0:  ftp://ftp.gnu.org/gnu/gdb/gdb-7.6.tar.bz2
 Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.6-rtems4.11-20130426.diff
@@ -121,7 +124,7 @@ Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/gdb-7.4-rtems4.11-20120125.di
 %endif
 
 %description
-GDB for target arm-rtemseabi4.11
+GDB for target arm-rtems4.11
 %prep
 %setup -q -c -T -n %{name}-%{version}
 
@@ -143,7 +146,7 @@ cd ..
   INSTALL="install -p" \
   ../gdb-%{gdb_version}/configure \
     --build=%_build --host=%_host \
-    --target=arm-rtemseabi4.11 \
+    --target=arm-rtems4.11 \
     --verbose --disable-nls \
     --without-included-gettext \
     --disable-win32-registry \
@@ -152,7 +155,7 @@ cd ..
     %{?with_system_readline:--with-system-readline} \
     --with-expat \
     %{?with_python:--with-python}%{!?with_python:--without-python} \
-    --with-gdb-datadir=%{_datadir}/arm-rtemseabi4.11-gdb-%{gdb_version} \
+    --with-gdb-datadir=%{_datadir}/arm-rtems4.11-gdb-%{gdb_version} \
     --prefix=%{_prefix} --bindir=%{_bindir} \
     --includedir=%{_includedir} --libdir=%{_libdir} \
     --mandir=%{_mandir} --infodir=%{_infodir}
@@ -180,24 +183,24 @@ cd ..
   rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty*
 
 # host library, installed to a bogus directory
-  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtemseabi4.11-sim.a
+  rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.11-sim.a
 
 # Bug in gdb-7.0, bogusly installs linux-only files
   somethinguseful=0
-  for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb-%{gdb_version}/syscalls/*.xml; do
+  for f in ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb-%{gdb_version}/syscalls/*.xml; do
     case $f in
     *linux.xml) rm -f $f;;
     *.xml) somethinguseful=1;;
     esac
   done
   if test $somethinguseful -eq 0; then
-    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb-%{gdb_version}/syscalls"
+    rm -rf "${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb-%{gdb_version}/syscalls"
   fi
 
 %if "{gdb_version}" >= "7.3"
 %if ! %{with python}
 # gdb-7.3 doesn't honor --without-python correctly
-  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtemseabi4.11-gdb-%{gdb_version}/python
+  rm -rf ${RPM_BUILD_ROOT}%{_datadir}/arm-rtems4.11-gdb-%{gdb_version}/python
 %endif
 %endif
 
@@ -240,30 +243,30 @@ sed -e 's,^\s*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
   rm -rf $RPM_BUILD_ROOT
 
 # ==============================================================
-# arm-rtemseabi4.11-gdb
+# arm-rtems4.11-gdb
 # ==============================================================
-# %package -n rtems-4.11-arm-rtemseabi4.11-gdb
-# Summary:      rtems gdb for arm-rtemseabi4.11
+# %package -n rtems-4.11-arm-rtems4.11-gdb
+# Summary:      rtems gdb for arm-rtems4.11
 # Group: Development/Tools
 # %if %build_infos
 # Requires: rtems-4.11-gdb-common
 # %endif
 
-%description -n rtems-4.11-arm-rtemseabi4.11-gdb
-GNU gdb targetting arm-rtemseabi4.11.
+%description -n rtems-4.11-arm-rtems4.11-gdb
+GNU gdb targetting arm-rtems4.11.
 
-%files -n rtems-4.11-arm-rtemseabi4.11-gdb
+%files -n rtems-4.11-arm-rtems4.11-gdb
 %defattr(-,root,root)
 %dir %{_prefix}
 %dir %{_prefix}/share
-%{?with_python:%{_datadir}/arm-rtemseabi4.11-gdb-%{gdb_version}}
+%{?with_python:%{_datadir}/arm-rtems4.11-gdb-%{gdb_version}}
 
 %dir %{_mandir}
 %dir %{_mandir}/man1
-%{_mandir}/man1/arm-rtemseabi4.11-*.1*
+%{_mandir}/man1/arm-rtems4.11-*.1*
 
 %dir %{_bindir}
-%{_bindir}/arm-rtemseabi4.11-*
+%{_bindir}/arm-rtems4.11-*
 
 # ==============================================================
 # rtems-4.11-gdb-common
diff --git a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-cpukit.spec b/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-cpukit.spec
deleted file mode 100644
index 3f53175..0000000
--- a/rtems4.11/arm/rtems-4.11-arm-rtemseabi4.11-cpukit.spec
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Please send bugfixes or comments to
-# 	http://www.rtems.org/bugzilla
-#
-
-%define _prefix                 /opt/rtems-4.11
-%define _exec_prefix            %{_prefix}
-%define _bindir                 %{_exec_prefix}/bin
-%define _sbindir                %{_exec_prefix}/sbin
-%define _libexecdir             %{_exec_prefix}/libexec
-%define _datarootdir            %{_prefix}/share
-%define _datadir                %{_datarootdir}
-%define _sysconfdir             %{_prefix}/etc
-%define _sharedstatedir         %{_prefix}/com
-%define _localstatedir          %{_prefix}/var
-%define _includedir             %{_prefix}/include
-%define _libdir                 %{_exec_prefix}/%{_lib}
-%define _mandir                 %{_datarootdir}/man
-%define _infodir                %{_datarootdir}/info
-%define _localedir              %{_datarootdir}/locale
-
-%ifos cygwin cygwin32 mingw mingw32
-%define _exeext .exe
-%define debug_package           %{nil}
-%define _libdir                 %{_exec_prefix}/lib
-%else
-%define _exeext %{nil}
-%endif
-
-%ifos cygwin cygwin32
-%define optflags -O3 -pipe -march=i486 -funroll-loops
-%endif
-
-%ifos mingw mingw32
-%if %{defined _mingw32_cflags}
-%define optflags %{_mingw32_cflags}
-%else
-%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
-%endif
-%endif
-
-%if "%{_build}" != "%{_host}"
-%define _host_rpmprefix %{_host}-
-%else
-%define _host_rpmprefix %{nil}
-%endif
-
-
-%define cpukit_pkgvers 4.9.99.0-20090206-2
-%define cpukit_version 4.9.99.0
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-2" | tr - . )}
-
-Name:         	rtems-4.11-arm-rtemseabi4.11-cpukit
-Summary:      	arm-rtemseabi4.11 cpukit
-
-Group:	      	Development/Tools
-Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}
-License:      	GPL
-URL:		http://cpukit.gnu.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
-
-%define debug_package %{nil}
-
-BuildRequires:	rtems-4.11-arm-rtemseabi4.11-gcc
-
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.11/rtems-%{cpukit_pkgvers}.tar.bz2
-
-%description
-RTEMS cpukit for arm-rtemseabi4.11.
-%prep
-%setup -c -T -n %{name}-%{version}
-
-%setup -q -T -D -n %{name}-%{version} -a0
-
-
-%build
-  export PATH="%{_bindir}:${PATH}"
-  mkdir -p build
-
-  cd build
-  ../rtems-%{cpukit_version}/configure \
-    --prefix=%{_prefix} \
-    --target=arm-rtemseabi4.11 \
-    --enable-multilib \
-    --disable-rtemsbsp
-
-  make all RTEMS_BSP=
-  cd ..
-
-%install
-  rm -rf $RPM_BUILD_ROOT
-  export PATH="%{_bindir}:${PATH}"
-  cd build
-  make DESTDIR=$RPM_BUILD_ROOT install
-  cd ..
-
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/share/man
-  rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
-# Extract %%__os_install_post into os_install_post~
-cat << \EOF > os_install_post~
-%__os_install_post
-EOF
-
-# Generate customized brp-*scripts
-cat os_install_post~ | while read a x y; do
-case $a in
-# Prevent brp-strip* from trying to handle foreign binaries
-*/brp-strip*)
-  b=$(basename $a)
-  sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b
-  chmod a+x $b
-  ;;
-# Fix up brp-compress to handle %%_prefix != /usr
-*/brp-compress*)
-  b=$(basename $a)
-  sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b
-  chmod a+x $b
-  ;;
-esac
-done
-
-sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
-  -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \
-< os_install_post~ > os_install_post 
-%define __os_install_post . ./os_install_post
-
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtemseabi4.11/' | %__find_provides
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
-
-cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
-#!/bin/sh
-grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtemseabi4.11/(lib|include|sys-root)' \
-  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtemseabi4.11/' | %__find_requires
-EOF
-chmod +x %{_builddir}/%{name}-%{version}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
-
-%clean
-  rm -rf $RPM_BUILD_ROOT
-
-%description -n rtems-4.11-arm-rtemseabi4.11-cpukit
-RTEMS cpukit for target arm-rtemseabi4.11.
-
-%files -n rtems-4.11-arm-rtemseabi4.11-cpukit
-%defattr(-,root,root)
-%dir %{_prefix}
-%{_prefix}/arm-rtemseabi4.11
-# Violates the FHS
-%exclude %{_prefix}/make




More information about the vc mailing list