2003-10-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* cpukit/target-cpukit.add: New.
	* cpukit/Makefile.am: Reflect having added target-cpukit.add.
	Acknowledge osversion.
	* cpukit/mkspec.in: Acknowledge osversion and rpmgroup.
	* cpukit/rtems-cpukit.add: Reflect new RTEMS spec conventions.

5 files changed, 67 insertions, 51 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 5e6528e843..bc2002e5ad 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,13 @@
 2003-10-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* cpukit/target-cpukit.add: New.
+	* cpukit/Makefile.am: Reflect having added target-cpukit.add.
+	Acknowledge osversion.
+	* cpukit/mkspec.in: Acknowledge osversion and rpmgroup.
+	* cpukit/rtems-cpukit.add: Reflect new RTEMS spec conventions.
+
+2003-10-07	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* autotools/automake-rtems.spec.in: Automake-1.7.8.
 
 2003-09-26	Joel Sherrill <joel@OARcorp.com>
diff --git a/scripts/cpukit/Makefile.am b/scripts/cpukit/Makefile.am
index 3b2100203a..29a82707d2 100644
--- a/scripts/cpukit/Makefile.am
+++ b/scripts/cpukit/Makefile.am
@@ -10,6 +10,7 @@ SUBPACKAGES = header.add
 SUBPACKAGES += $(top_builddir)/common/common.add
 SUBPACKAGES += rtems-cpukit.add
 SUBPACKAGES += $(top_builddir)/common/clean.add
+SUBPACKAGES += target-cpukit.add
 
 MKSPEC_DEPS = mkspec rtems-cpukit.spec.in \
     $(top_builddir)/setup.cache
@@ -18,49 +19,49 @@ rtems-cpukit.spec.in: $(SUBPACKAGES)
 	cat $^ > $@
 CLEANFILES = rtems-cpukit.spec.in
 
-c4x-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . c4x-rtems > $@
-RPM_SPECS_DATA = c4x-rtems-cpukit.spec
+c4x-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . c4x-rtems@osversion@ > $@
+RPM_SPECS_DATA = c4x-rtems@osversion@-cpukit.spec
 
-h8300-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . h8300-rtems > $@
-RPM_SPECS_DATA += h8300-rtems-cpukit.spec
+h8300-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . h8300-rtems@osversion@ > $@
+RPM_SPECS_DATA += h8300-rtems@osversion@-cpukit.spec
 
-i386-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems > $@
-RPM_SPECS_DATA += i386-rtems-cpukit.spec
+i386-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems@osversion@ > $@
+RPM_SPECS_DATA += i386-rtems@osversion@-cpukit.spec
 
-i960-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems > $@
-RPM_SPECS_DATA += i960-rtems-cpukit.spec
+i960-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems@osversion@ > $@
+RPM_SPECS_DATA += i960-rtems@osversion@-cpukit.spec
 
-m68k-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems > $@
-RPM_SPECS_DATA += m68k-rtems-cpukit.spec
+m68k-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems@osversion@ > $@
+RPM_SPECS_DATA += m68k-rtems@osversion@-cpukit.spec
 
-mips64orion-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems > $@
-RPM_SPECS_DATA += mips64orion-rtems-cpukit.spec
+mips64orion-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems@osversion@ > $@
+RPM_SPECS_DATA += mips64orion-rtems@osversion@-cpukit.spec
 
-mips-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . mips-rtems > $@
-RPM_SPECS_DATA += mips-rtems-cpukit.spec
+mips-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . mips-rtems@osversion@ > $@
+RPM_SPECS_DATA += mips-rtems@osversion@-cpukit.spec
 
-powerpc-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems > $@
-RPM_SPECS_DATA += powerpc-rtems-cpukit.spec
+powerpc-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems@osversion@ > $@
+RPM_SPECS_DATA += powerpc-rtems@osversion@-cpukit.spec
 
-sh-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems > $@
-RPM_SPECS_DATA += sh-rtems-cpukit.spec
+sh-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems@osversion@ > $@
+RPM_SPECS_DATA += sh-rtems@osversion@-cpukit.spec
 
-sh-rtemself-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself > $@
-RPM_SPECS_DATA += sh-rtemself-cpukit.spec
+sh-rtemself@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself@osversion@ > $@
+RPM_SPECS_DATA += sh-rtemself@osversion@-cpukit.spec
 
-sparc-rtems-cpukit.spec: $(MKSPEC_DEPS)
-	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems > $@
-RPM_SPECS_DATA += sparc-rtems-cpukit.spec
+sparc-rtems@osversion@-cpukit.spec: $(MKSPEC_DEPS)
+	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems@osversion@ > $@
+RPM_SPECS_DATA += sparc-rtems@osversion@-cpukit.spec
 
 EXTRA_DIST = $(SUBPACKAGES)
 
diff --git a/scripts/cpukit/mkspec.in b/scripts/cpukit/mkspec.in
index 9d43ebf503..1f97c8be8f 100644
--- a/scripts/cpukit/mkspec.in
+++ b/scripts/cpukit/mkspec.in
@@ -48,7 +48,8 @@ target_alias=$1
 
 sed -e "s%@Release\@%${rtems_rpm_release}%g" \
     -e "s%@rtems_version\@%${RTEMS_VERSION}%g" \
-    -e "s%@rpm_version\@%${RPM_VERSION}%g" \
+    -e "s%@rpmgroup\@%@rpmgroup@%g" \
+    -e "s%@osversion\@%@osversion@%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@target_alias\@%${target_alias}%g" \
 < ${RTEMS_DIR}/cpukit/rtems-cpukit.spec.in
diff --git a/scripts/cpukit/rtems-cpukit.add b/scripts/cpukit/rtems-cpukit.add
index 9593360e40..ab10fce991 100644
--- a/scripts/cpukit/rtems-cpukit.add
+++ b/scripts/cpukit/rtems-cpukit.add
@@ -1,18 +1,25 @@
-Name:         @target_alias@-cpukit
+%define rtems_version @rtems_version@
+%define rtems_target  @target_alias@
+%define rpmvers %{expand: %%(echo %rtems_version | tr - _ )}
+
+Name:         %{rpmprefix}@target_alias@-cpukit
 Release:      @Release@
 License:      Various, Open Source.
-Group:        rtems
+Group:        %{rpmgroup}
 
 Autoreqprov:  on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
-BuildPreReq:    @target_alias@-binutils
-BuildPreReq:    @target_alias@-gcc 
-Requires:     	@target_alias@-binutils
-Requires:     	@target_alias@-gcc 
+BuildPreReq:    %{rpmprefix}%{rtems_target}-binutils
+BuildPreReq:    %{rpmprefix}%{rtems_target}-gcc 
+Requires:     	%{rpmprefix}%{rtems_target}-binutils
+Requires:     	%{rpmprefix}%{rtems_target}-gcc 
+
+# These are target libs, arch doesn't matter for the host
+BuildArch:	noarch
 
-Version:      @rpm_version@
+Version:      %{rpmvers}
 Summary:      A free operating system for embedded systems
-Source:       rtems-@rtems_version@.tar.gz
+Source:       rtems-%{rtems_version}.tar.bz2
 
 #
 # The original sources are not included in the source RPM.
@@ -32,7 +39,7 @@ Prefix:		%{_prefix}
 %description
 RTEMS is a free operating system for embedded systems.
 
-This package contains the cpukit for cpu @target_alias@.
+This package contains the cpukit for cpu %{rtems_target}.
 
 Authors:
 --------
@@ -45,18 +52,14 @@ test -d build || mkdir build
 %build
 cd build
 # rtems does not support building inside the source tree
-  ../rtems-@rtems_version@/cpukit/configure \
-  --build=`../rtems-@rtems_version@/config.guess` \
+  ../rtems-%{rtems_version}/cpukit/configure \
+  --build=`../rtems-%{rtems_version}/config.guess` \
   --prefix=%{_prefix} \
-  --host=@target_alias@ --target=@target_alias@ \
-  --exec-prefix=%{_prefix}/@target_alias@ \
+  --host=%{rtems_target} --target=%{rtems_target} \
+  --exec-prefix=%{_prefix}/%{rtems_target} \
   --enable-multilib
   make RTEMS_BSP=
 %install
 cd build
   make RTEMS_BSP= DESTDIR=${RPM_BUILD_ROOT} install
 
-%files
-%{_prefix}/@target_alias@
-# ignore
-# %{_mandir}
\ No newline at end of file
diff --git a/scripts/cpukit/target-cpukit.add b/scripts/cpukit/target-cpukit.add
new file mode 100644
index 0000000000..4447474018
--- /dev/null
+++ b/scripts/cpukit/target-cpukit.add
@@ -0,0 +1,3 @@
+%files
+%{_prefix}/%{rtems_target}
+%exclude %{_prefix}/man
\ No newline at end of file