2002-11-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* binutils/binutils.add: Add BuildPreReq: /sbin/install-info.
	Disable nls.
	Apply gzip -9qf to compress *infos and *mans.
	Apply /sbin/install-info.
	Remove  *c++-filt.
	* binutils/base-binutils.add: Add PreReq: /sbin/install-info.
	Apply /sbin/install-info.
	Package as.info-*.gz.
	* binutils/target-binutils.add:
	Package man1/*.1*.

4 files changed, 24 insertions, 8 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 87f8a54189..ba41d5c173 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,16 @@
+2002-11-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* binutils/binutils.add: Add BuildPreReq: /sbin/install-info.
+	Disable nls.
+	Apply gzip -9qf to compress *infos and *mans.
+	Apply /sbin/install-info.
+	Remove  *c++-filt.
+	* binutils/base-binutils.add: Add PreReq: /sbin/install-info.
+	Apply /sbin/install-info.
+	Package as.info-*.gz.
+	* binutils/target-binutils.add: 
+	Package man1/*.1*.
+
 2002-11-15	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* autotool/autoconf-rtems.spec.in: Fix @prefix@.
diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add
index 9e831286a7..fb6327da2b 100644
--- a/scripts/binutils/base-binutils.add
+++ b/scripts/binutils/base-binutils.add
@@ -5,6 +5,7 @@
 Provides:	rtems-base-binutils
 Summary:      base package for rtems binutils
 Group: rtems
+PreReq:		/sbin/install-info
 
 %description -n rtems-base-binutils
 
@@ -18,7 +19,7 @@ This is the base for binutils regardless of target CPU.
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     done
   fi
 
@@ -28,7 +29,7 @@ This is the base for binutils regardless of target CPU.
     rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
     test x"$f" != x"" && for i in $f; do
-      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
+      /sbin/install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     done
   fi
 
@@ -36,7 +37,7 @@ This is the base for binutils regardless of target CPU.
 %dir %{_prefix}/info
 %doc %{_prefix}/info/dir
 %doc %{_prefix}/info/as.info.gz
-%doc %{_prefix}/info/as.info-?.gz
+%doc %{_prefix}/info/as.info-*.gz
 %doc %{_prefix}/info/bfd.info.gz
 %doc %{_prefix}/info/bfd.info-?.gz
 %doc %{_prefix}/info/binutils.info.gz
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index bdda16e595..571f4fb108 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -20,6 +20,7 @@ Autoreqprov:  	off
 Packager:     	corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 Prefix:		%{_prefix}
 BuildRoot:	%{_tmppath}/@target_alias@-binutils
+BuildPreReq:	/sbin/install-info
 
 Version:      	@binutils_version@
 Source0:	ftp://ftp.gnu.org/pub/gnu/binutils/binutils-@binutils_version@.tar.bz2
@@ -57,7 +58,7 @@ This is binutils sources with patches for RTEMS.
 
   cd build
   ../binutils-@binutils_version@/configure ${CONFIGURE_ARGS} --target=@target_alias@ \
-    --verbose --prefix=%{_prefix}
+    --verbose --prefix=%{_prefix} --disable-nls
 
   make all
   make info
@@ -72,9 +73,10 @@ This is binutils sources with patches for RTEMS.
   ../binutils-@binutils_version@/mkinstalldirs \
     $RPM_BUILD_ROOT%{_prefix}/share/locale
 
+  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-c++filt
 # gzip info files
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
-  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
+  gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
+  gzip -9qf $RPM_BUILD_ROOT%{_prefix}/info/*.info-* 2>/dev/null
 
   if test -f $RPM_BUILD_ROOT%{_prefix}/info/configure.info.gz;
   then
@@ -89,7 +91,7 @@ This is binutils sources with patches for RTEMS.
   rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
   f=`find $RPM_BUILD_ROOT%{_prefix}/info -name '*.info.gz'`
   test x"$f" != x"" && for i in $f; do
-    install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
+    /sbin/install-info $i $RPM_BUILD_ROOT%{_prefix}/info/dir
   done
 
 %clean
diff --git a/scripts/binutils/target-binutils.add b/scripts/binutils/target-binutils.add
index 8abca5c84d..35f2598cf4 100644
--- a/scripts/binutils/target-binutils.add
+++ b/scripts/binutils/target-binutils.add
@@ -15,7 +15,7 @@ RTEMS is an open source operating system for embedded systems.
 This is the GNU binutils for RTEMS targetting @target_alias@.
 
 %files -n @target_alias@-binutils
-%doc %{_prefix}/man/man1/@target_alias@-*.1
+%doc %{_prefix}/man/man1/@target_alias@-*.1*
 
 %dir %{_prefix}/bin
 %{_prefix}/bin/@target_alias@-addr2line@exe_ext@