From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 scripts-ada/gnatnewlib/.cvsignore         |  1 +
 scripts-ada/gnatnewlib/Makefile.am        | 21 +++++++++------------
 scripts-ada/gnatnewlib/gnatnewlib.spec.in | 13 ++++++++-----
 3 files changed, 18 insertions(+), 17 deletions(-)

(limited to 'scripts-ada/gnatnewlib')

diff --git a/scripts-ada/gnatnewlib/.cvsignore b/scripts-ada/gnatnewlib/.cvsignore
index 5ba8729732..ccfad11c76 100644
--- a/scripts-ada/gnatnewlib/.cvsignore
+++ b/scripts-ada/gnatnewlib/.cvsignore
@@ -1,3 +1,4 @@
+*.spec
 Makefile
 Makefile.in
 gnatnewlib.spec
diff --git a/scripts-ada/gnatnewlib/Makefile.am b/scripts-ada/gnatnewlib/Makefile.am
index 7f5196617a..52232e9c4d 100644
--- a/scripts-ada/gnatnewlib/Makefile.am
+++ b/scripts-ada/gnatnewlib/Makefile.am
@@ -1,11 +1,11 @@
 ## $Id$
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.4
 
 MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec
 
-MKGNATNEWLIBSPEC_DEPS = \
-  $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in $(top_builddir)/setup.cache
+MKGNATNEWLIBSPEC_DEPS = $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in \
+    $(top_builddir)/setup.cache
 
 powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 	$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems
@@ -13,17 +13,14 @@ powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS)
 	$(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems
 
-TEMPLATES = \
-gnatnewlib.spec.in
+TEMPLATES = gnatnewlib.spec.in
 
-RPM_SPECS_DATA = \
-powerpc-rtems-$(GNATNEWLIBVERS).spec \
-sparc-rtems-$(GNATNEWLIBVERS).spec 
+RPM_SPECS_DATA = powerpc-rtems-$(GNATNEWLIBVERS).spec \
+    sparc-rtems-$(GNATNEWLIBVERS).spec
 
-noinst_DATA = \
-$(TEMPLATES)
+noinst_DATA = $(TEMPLATES)
 
-EXTRA_DIST = \
-$(TEMPLATES)
+EXTRA_DIST = $(TEMPLATES)
 
 CLEANFILES = $(RPM_SPECS_DATA)
+include $(top_srcdir)/../automake/local.am
diff --git a/scripts-ada/gnatnewlib/gnatnewlib.spec.in b/scripts-ada/gnatnewlib/gnatnewlib.spec.in
index ff54a2e6ee..b140b85911 100644
--- a/scripts-ada/gnatnewlib/gnatnewlib.spec.in
+++ b/scripts-ada/gnatnewlib/gnatnewlib.spec.in
@@ -12,7 +12,7 @@ Name:         @target_alias@-gnat-newlib
 Summary:      gnat, gcc, and newlib C Library for @target_alias@.
 Group:	      gnatrtems
 Release:      @Release@
-Copyright:    1999 OARCorp
+License:      gcc is GPL/LGPL ; newlib no has restrictions on run-time usage
 
 Provides:     	rtems-base-gnat @target_alias@-gnat 
 Provides:       rtems-base-gnat-binutils @target_alias@-gnat-binutils
@@ -26,10 +26,10 @@ Source0:	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
 Source1:	ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz
 Source2:	ftp://cs.nyu.edu/pub/gnat/gnat-@gnat_version@-src.tar.gz
 Source3:      	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.gz
-Patch0:		gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
+Patch0:		gcc-@gcc_version@-rtems-gnat-@gnat_version@-@gcc_patch_version@.diff
 Patch1:		newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
-Patch2:		gnat-@gnat_version@-src-rtems-@gnat_patch_version@.diff
-Patch3:		binutils-@binutils_version@-rtems-@binutils_patch_version@.diff
+Patch2:		gnat-@gnat_version@-rtems-@gnat_patch_version@.diff
+Patch3:		binutils-@binutils_version@-rtems-gnat-@gnat_version@-@binutils_patch_version@.diff
 #
 Buildroot:	/tmp
 
@@ -44,7 +44,10 @@ Buildroot:	/tmp
 # your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
 # Or you can try the ftp options of rpm :-)
 #
-NoSource:      0, 1, 2, 3
+NoSource:	0
+NoSource:	1
+NoSource:	2
+NoSource:	3
 
 %description
 RTEMS is an open source operating system for embedded systems.
-- 
cgit v1.2.3