Regenerate.

12 files changed, 592 insertions, 118 deletions

diff --git a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
index 831686f8a9..efb0fdc031 100644
--- a/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%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.10-arm-rtems4.10-cpukit
 Summary:      	arm-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-arm-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for arm-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=arm-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/arm-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-arm-rtems4.10-cpukit
-GNU cc compiler for arm-rtems4.10.
+RTEMS cpukit for target arm-rtems4.10.
 
 %files -n rtems-4.10-arm-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/arm-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
index 649f639a4b..a51cb771cb 100644
--- a/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-avr-rtems4.10-cpukit
 Summary:      	avr-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-avr-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for avr-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=avr-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/avr-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/avr-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-avr-rtems4.10-cpukit
-GNU cc compiler for avr-rtems4.10.
+RTEMS cpukit for target avr-rtems4.10.
 
 %files -n rtems-4.10-avr-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/avr-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec
new file mode 100644
index 0000000000..86558e2407
--- /dev/null
+++ b/contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-cpukit.spec
@@ -0,0 +1,149 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%define _prefix                 /opt/rtems-4.10
+%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
+%else
+%define _exeext %{nil}
+%endif
+
+%ifos cygwin cygwin32
+%define optflags -O3 -pipe -march=i486 -funroll-loops
+%define _libdir			%{_exec_prefix}/lib
+%define debug_package		%{nil}
+%endif
+
+%if "%{_build}" != "%{_host}"
+%define _host_rpmprefix rtems-4.10-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+
+%define cpukit_pkgvers 4.7.99.1-20070510
+%define cpukit_version 4.7.99.1
+%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+
+Name:         	rtems-4.10-bfin-rtems4.10-cpukit
+Summary:      	bfin-rtems4.10 cpukit
+
+Group:	      	Development/Tools
+Version:        %{cpukit_rpmvers}
+Release:      	1%{?dist}%{?dist}
+License:      	GPL
+URL:		http://cpukit.gnu.org
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:	noarch
+
+%define _use_internal_dependency_generator 0
+
+BuildRequires:	rtems-4.10-bfin-rtems4.10-gcc
+
+Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems-%{cpukit_pkgvers}.tar.bz2
+%{?_without_sources:NoSource:   0}
+
+%description
+RTEMS cpukit for bfin-rtems4.10.
+%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_pkgvers}/configure \
+    --prefix=%{_prefix} \
+    --target=bfin-rtems4.10 \
+    --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}-%{cpukit_rpmvers}/find-provides
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.10/' | %__find_provides
+EOF
+chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+
+cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+#!/bin/sh
+grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/bfin-rtems4.10/' | %__find_requires
+EOF
+chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+
+%clean
+  rm -rf $RPM_BUILD_ROOT
+
+%description -n rtems-4.10-bfin-rtems4.10-cpukit
+GNU cc compiler for bfin-rtems4.10.
+
+%files -n rtems-4.10-bfin-rtems4.10-cpukit
+%dir %{_prefix}
+%{_prefix}/bfin-rtems4.10
+# Violates the FHS
+%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
index a7997f102d..1b7f5cfae9 100644
--- a/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-h8300-rtems4.10-cpukit
 Summary:      	h8300-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-h8300-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for h8300-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=h8300-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/h8300-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/h8300-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-h8300-rtems4.10-cpukit
-GNU cc compiler for h8300-rtems4.10.
+RTEMS cpukit for target h8300-rtems4.10.
 
 %files -n rtems-4.10-h8300-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/h8300-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
index 118a85b31f..9246b440ea 100644
--- a/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-i386-rtems4.10-cpukit
 Summary:      	i386-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-i386-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for i386-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=i386-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/i386-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/i386-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-i386-rtems4.10-cpukit
-GNU cc compiler for i386-rtems4.10.
+RTEMS cpukit for target i386-rtems4.10.
 
 %files -n rtems-4.10-i386-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/i386-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-cpukit.spec
new file mode 100644
index 0000000000..8fd9d864aa
--- /dev/null
+++ b/contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-cpukit.spec
@@ -0,0 +1,158 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%define _prefix                 /opt/rtems-4.10
+%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 rtems-4.10-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
+
+Name:         	rtems-4.10-m32c-rtems4.10-cpukit
+Summary:      	m32c-rtems4.10 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.10-m32c-rtems4.10-gcc
+
+Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems-%{cpukit_pkgvers}.tar.bz2
+%{?_without_sources:NoSource:   0}
+
+%description
+RTEMS cpukit for m32c-rtems4.10.
+%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=m32c-rtems4.10 \
+    --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}/m32c-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32c-rtems4.10/' | %__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}/m32c-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32c-rtems4.10/' | %__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.10-m32c-rtems4.10-cpukit
+RTEMS cpukit for target m32c-rtems4.10.
+
+%files -n rtems-4.10-m32c-rtems4.10-cpukit
+%defattr(-,root,root)
+%dir %{_prefix}
+%{_prefix}/m32c-rtems4.10
+# Violates the FHS
+%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-cpukit.spec
new file mode 100644
index 0000000000..17909c10f5
--- /dev/null
+++ b/contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-cpukit.spec
@@ -0,0 +1,158 @@
+#
+# Please send bugfixes or comments to
+# 	http://www.rtems.org/bugzilla
+#
+
+%define _prefix                 /opt/rtems-4.10
+%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 rtems-4.10-%{_host}-
+%else
+%define _host_rpmprefix %{nil}
+%endif
+
+
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
+
+Name:         	rtems-4.10-m32r-rtems4.10-cpukit
+Summary:      	m32r-rtems4.10 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.10-m32r-rtems4.10-gcc
+
+Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems-%{cpukit_pkgvers}.tar.bz2
+%{?_without_sources:NoSource:   0}
+
+%description
+RTEMS cpukit for m32r-rtems4.10.
+%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=m32r-rtems4.10 \
+    --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}/m32r-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32r-rtems4.10/' | %__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}/m32r-rtems4.10/(lib|include|sys-root)' \
+  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m32r-rtems4.10/' | %__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.10-m32r-rtems4.10-cpukit
+RTEMS cpukit for target m32r-rtems4.10.
+
+%files -n rtems-4.10-m32r-rtems4.10-cpukit
+%defattr(-,root,root)
+%dir %{_prefix}
+%{_prefix}/m32r-rtems4.10
+# Violates the FHS
+%exclude %{_prefix}/make
diff --git a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
index eab179f881..00abd9460b 100644
--- a/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-m68k-rtems4.10-cpukit
 Summary:      	m68k-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-m68k-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for m68k-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=m68k-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m68k-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/m68k-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-m68k-rtems4.10-cpukit
-GNU cc compiler for m68k-rtems4.10.
+RTEMS cpukit for target m68k-rtems4.10.
 
 %files -n rtems-4.10-m68k-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/m68k-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
index 9cc79f1876..a697e05039 100644
--- a/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-mips-rtems4.10-cpukit
 Summary:      	mips-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-mips-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for mips-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=mips-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/mips-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/mips-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-mips-rtems4.10-cpukit
-GNU cc compiler for mips-rtems4.10.
+RTEMS cpukit for target mips-rtems4.10.
 
 %files -n rtems-4.10-mips-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/mips-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
index 7df97ae0e1..e0517997b7 100644
--- a/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-powerpc-rtems4.10-cpukit
 Summary:      	powerpc-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-powerpc-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for powerpc-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=powerpc-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/powerpc-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/powerpc-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-powerpc-rtems4.10-cpukit
-GNU cc compiler for powerpc-rtems4.10.
+RTEMS cpukit for target powerpc-rtems4.10.
 
 %files -n rtems-4.10-powerpc-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/powerpc-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
index 5f991bcf13..5649c2b63b 100644
--- a/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-cpukit.spec
@@ -46,22 +46,22 @@
 %endif
 
 
-%define cpukit_pkgvers 4.7.99.1-20070510
-%define cpukit_version 4.7.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.7.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-sh-rtems4.10-cpukit
 Summary:      	sh-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-sh-rtems4.10-gcc
 
@@ -81,7 +81,7 @@ RTEMS cpukit for sh-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=sh-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sh-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sh-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-sh-rtems4.10-cpukit
-GNU cc compiler for sh-rtems4.10.
+RTEMS cpukit for target sh-rtems4.10.
 
 %files -n rtems-4.10-sh-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/sh-rtems4.10
 # Violates the FHS
diff --git a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
index cbf5c84949..f308c5f371 100644
--- a/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
+++ b/contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-cpukit.spec
@@ -46,26 +46,26 @@
 %endif
 
 
-%define cpukit_pkgvers 4.9.99.1-20070510
-%define cpukit_version 4.9.99.1
-%define cpukit_rpmvers %{expand:%(echo "4.9.99.1" | tr - _ )}
+%define cpukit_pkgvers 4.9.99.0-20090206-1
+%define cpukit_version 4.9.99.0
+%define cpukit_rpmvers %{expand:%(echo "4.9.99.0-20090206-1" | tr - . )}
 
 Name:         	rtems-4.10-sparc-rtems4.10-cpukit
 Summary:      	sparc-rtems4.10 cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	1%{?dist}%{?dist}
+Release:      	1%{?dist}
 License:      	GPL
 URL:		http://cpukit.gnu.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
-%define _use_internal_dependency_generator 0
+%define debug_package %{nil}
 
 BuildRequires:	rtems-4.10-sparc-rtems4.10-gcc
 
-Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/rtems-%{cpukit_pkgvers}.tar.bz2
+Source0: 	ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/rtems-%{cpukit_pkgvers}.tar.bz2
 %{?_without_sources:NoSource:   0}
 
 %description
@@ -81,7 +81,7 @@ RTEMS cpukit for sparc-rtems4.10.
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=sparc-rtems4.10 \
     --enable-multilib \
@@ -128,29 +128,30 @@ sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \
 %define __os_install_post . ./os_install_post
 
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sparc-rtems4.10/' | %__find_provides
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
-%define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
+chmod +x %{_builddir}/%{name}-%{version}/find-provides
+%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
 
-cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
 #!/bin/sh
 grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/sparc-rtems4.10/' | %__find_requires
 EOF
-chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
-%define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
+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.10-sparc-rtems4.10-cpukit
-GNU cc compiler for sparc-rtems4.10.
+RTEMS cpukit for target sparc-rtems4.10.
 
 %files -n rtems-4.10-sparc-rtems4.10-cpukit
+%defattr(-,root,root)
 %dir %{_prefix}
 %{_prefix}/sparc-rtems4.10
 # Violates the FHS