Sync with CVS-HEAD.

9 files changed, 20 insertions, 25 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
diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add
index 3648ee25a6..73ee9e1fd7 100644
--- a/contrib/crossrpms/gcc/base-newlib.add
+++ b/contrib/crossrpms/gcc/base-newlib.add
@@ -7,6 +7,7 @@
 Summary:	Base package for RTEMS newlib C Library
 Group:          Development/Tools
 Version:        %{newlib_version}
+Release:        @NEWLIB_RPMREL@
 License:	Distributable
 
 Requires(post): 	/sbin/install-info
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add
index 2341c5a2a2..652844ae09 100644
--- a/contrib/crossrpms/gcc/gccnewlib.add
+++ b/contrib/crossrpms/gcc/gccnewlib.add
@@ -4,8 +4,8 @@
 %define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )}
 
 %if %build_newlib
+%define newlib_pkgvers		@NEWLIB_PKGVERS@
 %define newlib_version		@NEWLIB_VERS@
-%define gccnewlib_version	gcc%{gcc_version}newlib%{newlib_version}
 %endif
 
 %define mpfr_version	2.3.1
@@ -38,12 +38,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:  @rpmprefix@@tool_target@-gcc
+BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
 %endif
 
 %if "%{gcc_version}" >= "4.2.0"
@@ -73,7 +72,7 @@ Requires:	@rpmprefix@@tool_target@-binutils
 Requires:	@rpmprefix@@tool_target@-sys-root
 Requires:	@rpmprefix@@tool_target@-w32api-sys-root
 %if %build_newlib
-Requires:	@rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
+Requires:	@rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
 %endif
 
 %if %build_gcj
@@ -83,7 +82,7 @@ BuildRequires:	zlib-devel
 # Building gnat requires gnat
 # This really isn't available until RedHat 8.0.  How to conditionalize this?
 BuildRequires:	gcc-gnat
-BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release}
+BuildRequires:	@rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
 %endif
 %if %build_f95
 BuildRequires: gmp-devel
diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add
index 8160444978..38900f4ff5 100644
--- a/contrib/crossrpms/gcc/target-c++.add
+++ b/contrib/crossrpms/gcc/target-c++.add
@@ -9,7 +9,7 @@ Version:        %{gcc_rpmvers}
 License:	GPL
 
 %if "%{_build}" != "%{_host}"
-BuildRequires:  @rpmprefix@@tool_target@-gcc-c++
+BuildRequires:  @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
 %endif
 Provides:	@rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
 Obsoletes:	@rpmprefix@@tool_target@-c++ < %{gcc_rpmvers}-%{release}
@@ -35,10 +35,6 @@ GCC c++ compiler for @tool_target@.
 %{gccexec}/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
 
 %dir %{gcclib}/@tool_target@/%{gcc_version}/include
-%if "%{gcc_version}" >= "3.2"
 %{gcclib}/@tool_target@/%{gcc_version}/include/c++
-%else
-%{gcclib}/@tool_target@/%{gcc_version}/include/g++
-%endif
 %endif
 
diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add
index 042b72757e..0e4fc99cb4 100644
--- a/contrib/crossrpms/gcc/target-gcc.add
+++ b/contrib/crossrpms/gcc/target-gcc.add
@@ -6,7 +6,7 @@
 # Group:          Development/Tools
 # Version:        %{gcc_rpmvers}
 # Requires:       @rpmprefix@@tool_target@-binutils
-# Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
+# Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
 # License:	GPL
 
 # %if %build_infos
diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add
index e40908d21a..8f8ba045cb 100644
--- a/contrib/crossrpms/gcc/target-newlib.add
+++ b/contrib/crossrpms/gcc/target-newlib.add
@@ -7,9 +7,7 @@ Summary:      	C Library (newlib) for @tool_target@
 Group: 		Development/Tools
 License:	Distributable
 Version:	%{newlib_version}
-
-Provides:	@rpmprefix@@tool_target@-libc = %{newlib_version}-%{release}
-Obsoletes:	@rpmprefix@@tool_target@-libc < %{newlib_version}-%{release}
+Release:        @NEWLIB_RPMREL@
 
 %if %build_infos
 Requires:	@rpmprefix@newlib-common