Rework.

4 files changed, 12 insertions, 11 deletions

diff --git a/contrib/crossrpms/cpukit/build.add b/contrib/crossrpms/cpukit/build.add
index 2fb3d76b3b..cd42b088cb 100644
--- a/contrib/crossrpms/cpukit/build.add
+++ b/contrib/crossrpms/cpukit/build.add
@@ -5,7 +5,7 @@
   mkdir -p build
 
   cd build
-  ../rtems-%{cpukit_pkgvers}/configure \
+  ../rtems-%{cpukit_version}/configure \
     --prefix=%{_prefix} \
     --target=@tool_target@ \
     --enable-multilib \
diff --git a/contrib/crossrpms/cpukit/cpukit.add b/contrib/crossrpms/cpukit/cpukit.add
index 2760f02ed6..f63b1c7bef 100644
--- a/contrib/crossrpms/cpukit/cpukit.add
+++ b/contrib/crossrpms/cpukit/cpukit.add
@@ -1,20 +1,20 @@
 
 %define cpukit_pkgvers @CPUKIT_PKGVERS@
 %define cpukit_version @CPUKIT_VERS@
-%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_VERS@" | tr - _ )}
+%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_PKGVERS@" | tr - . )}
 
 Name:         	@rpmprefix@@tool_target@-cpukit
 Summary:      	@tool_target@ cpukit
 
 Group:	      	Development/Tools
 Version:        %{cpukit_rpmvers}
-Release:      	@CPUKIT_RPMREL@%{?dist}
+Release:      	@CPUKIT_RPMREL@
 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:	@rpmprefix@@tool_target@-gcc
 
diff --git a/contrib/crossrpms/cpukit/rpm-install.add b/contrib/crossrpms/cpukit/rpm-install.add
index 320c6138a4..6121fae815 100644
--- a/contrib/crossrpms/cpukit/rpm-install.add
+++ b/contrib/crossrpms/cpukit/rpm-install.add
@@ -31,19 +31,19 @@ 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}/@tool_target@/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__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}/@tool_target@/(lib|include|sys-root)' \
   | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__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
 
diff --git a/contrib/crossrpms/cpukit/target-cpukit.add b/contrib/crossrpms/cpukit/target-cpukit.add
index 7f29d1267d..79b873d853 100644
--- a/contrib/crossrpms/cpukit/target-cpukit.add
+++ b/contrib/crossrpms/cpukit/target-cpukit.add
@@ -1,7 +1,8 @@
 %description -n @rpmprefix@@tool_target@-cpukit
-GNU cc compiler for @tool_target@.
+RTEMS cpukit for target @tool_target@.
 
 %files -n @rpmprefix@@tool_target@-cpukit
+%defattr(-,root,root)
 %sysdir %{_prefix}
 %{_prefix}/@tool_target@
 # Violates the FHS