2003-01-31 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* common/common.add.in: Add Vendor, Distribution, BuildRoot.
	* binutils/Makefile.am: Fix path to clean.add.
	* binutils/binutils.add: Remove BuildRoot.
	* cpukit/Makefile.am:  Use $(top_builddir)/common/common.add,
	$(top_builddir)/common/clean.add, header.add.
	Generate rtems-cpukit.spec.in.
	* cpukit/header.add: New.
	* cpukit/rtems-cpukit.spec.in: Remove.
	* cpukit/rtems-cpukit.add: New.
	* gccnewlib/gccnewlib.add: Remove Buildroot.
	* gdb/gdb.add: Remove Buildroot.
	* rtemsdoc/rtemsdoc.add: Remove BuildRoot.

scripts/ChangeLog

@@ -1,3 +1,18 @@
+2003-01-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* common/common.add.in: Add Vendor, Distribution, BuildRoot.
+	* binutils/Makefile.am: Fix path to clean.add.
+	* binutils/binutils.add: Remove BuildRoot.
+	* cpukit/Makefile.am:  Use $(top_builddir)/common/common.add,
+	$(top_builddir)/common/clean.add, header.add.
+	Generate rtems-cpukit.spec.in.
+	* cpukit/header.add: New.
+	* cpukit/rtems-cpukit.spec.in: Remove.
+	* cpukit/rtems-cpukit.add: New.
+	* gccnewlib/gccnewlib.add: Remove Buildroot.
+	* gdb/gdb.add: Remove Buildroot.
+	* rtemsdoc/rtemsdoc.add: Remove BuildRoot.
+
 2003-01-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* rtemsdoc/Makefile.am: Use $(top_builddir)/common/common.add,

scripts/binutils/Makefile.am

@@ -7,7 +7,7 @@ MKBINUTILSSPEC = $(SHELL) ./mkspec
 
 SUBPACKAGES = header.add
 SUBPACKAGES += $(top_builddir)/common/common.add binutils.add
-SUBPACKAGES += $(top_builddir)./common/clean.add
+SUBPACKAGES += $(top_builddir)/common/clean.add
 SUBPACKAGES += base-binutils.add target-binutils.add
 
 binutils.spec.in: $(SUBPACKAGES)

scripts/binutils/binutils.add

@@ -7,7 +7,6 @@ License:      GPL/LGPL
 Autoreqprov:  	on
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 Prefix:		%{_prefix}
-BuildRoot:	%{_defaultbuildroot}
 BuildPreReq:	/sbin/install-info
 BuildPreReq:	texinfo >= 4.2
 

scripts/common/common.add.in

@@ -12,3 +12,7 @@
 %define _exeext %{nil}
 %endif
 
+Vendor: 	OARCorp
+Distribution: 	Linux
+
+BuildRoot:	%{_defaultbuildroot}

scripts/cpukit/Makefile.am

@@ -5,9 +5,18 @@
 
 MKSPEC = $(SHELL) ./mkspec
 
+SUBPACKAGES = header.add
+SUBPACKAGES += $(top_builddir)/common/common.add
+SUBPACKAGES += rtems-cpukit.add
+SUBPACKAGES += $(top_builddir)/common/clean.add
+
 MKSPEC_DEPS = mkspec rtems-cpukit.spec.in \
     $(top_builddir)/setup.cache
 
+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
@@ -56,11 +65,8 @@ sparc-rtems-cpukit.spec: $(MKSPEC_DEPS)
 	$(MKSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems > $@
 RPM_SPECS_DATA += sparc-rtems-cpukit.spec
 
-TEMPLATES = rtems-cpukit.spec.in
+EXTRA_DIST = $(SUBPACKAGES)
 
-noinst_DATA = $(TEMPLATES)
+CLEANFILES += $(RPM_SPECS_DATA)
 
-EXTRA_DIST = $(TEMPLATES)
-
-CLEANFILES = $(RPM_SPECS_DATA)
 include $(top_srcdir)/../automake/local.am

scripts/cpukit/header.add

@@ -0,0 +1,4 @@
+#
+# spec file for package rtems-cpukit
+# 
+# Copyright  (c)  2002 Ralf Corsepius, Ulm, Germany

scripts/cpukit/rtems-cpukit.add

@@ -1,15 +1,3 @@
-#
-# spec file for package rtems-cpukit
-# 
-# Copyright  (c)  2002 Ralf Corsepius, Ulm, Germany
-#
-# please send bugfixes or comments to joel@OARcorp.com
-#
-
-%define _prefix	/opt/rtems
-
-Vendor:       OAR Corporation
-Distribution: Linux
 Name:         @target_alias@-cpukit
 Release:      @Release@
 License:      Various, Open Source.
@@ -40,7 +28,6 @@ Source:       rtems-@rtems_version@.tar.gz
 NoSource:      0
 # We claim to be relocatible, but in fact we are not
 Prefix:		%{_prefix}
-Buildroot:    %{_tmppath}/%{name}-%{version}-root
 
 %description
 RTEMS is a free operating system for embedded systems.

scripts/gccnewlib/gccnewlib.add

@@ -15,7 +15,6 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.gz
 Source1:	ftp://sources.redhat.com/pub/newlib/newlib-@newlib_version@.tar.gz
 Patch0:		gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
 Patch1:		newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
-Buildroot:	%{_tmppath}/%{name}
 
 #
 # The original sources are not included in the source RPM.

scripts/gdb/gdb.add

@@ -12,7 +12,6 @@ Source0:      ftp://ftp.gnu.org/pub/gnu/gdb-@gdb_version@.tar.gz
 Patch0:	      gdb-@gdb_version@-rtems-base-@gdb_patch_version@.diff
 Patch1:	      gdb-@gdb_version@-rtems-cg-@gdb_patch_version@.diff
 Patch2:	      gdb-@gdb_version@-rtems-rdbg-@gdb_patch_version@.diff
-Buildroot:    %{_defaultbuildroot}
 
 %if "%{_vendor}" == "redhat"
 BuildPreReq:	ncurses-devel

scripts/rtemsdoc/rtemsdoc.add

@@ -35,7 +35,6 @@ NoSource:      0
 Prefix:		%{_prefix}
 Prefix:		%{_infodir}
 Prefix:		%{_datadir}
-BuildRoot:    	%{_tmppath}/%{name}-%{version}-root
 BuildArch:	noarch
 
 %description