2005-04-26 Ralf Corsepius <ralf.corsepius@rtems.org>

	* gccnewlib/base-gcc.add: Install infos using FC conventions.
	* gccnewlib/base-gcj.add: Install infos using FC conventions.
	Various minor fixes.
	* gccnewlib/base-gfortran.add: Install infos using FC conventions.
	* gccnewlib/target-gcj.add: Various minor fixes.

4 files changed, 70 insertions, 46 deletions

diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index afc83c7ee2..48d83d1fe6 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -5,6 +5,9 @@
 Summary:      	base package for rtems gcc and newlib C Library 
 Group: %{rpmgroup}
 
+Requires(post): 	/sbin/install-info
+Requires(postun):	/sbin/install-info
+
 %description -n %{rpmprefix}rtems@osversion@-base-gcc
 
 RTEMS is an open source operating system for embedded systems.
@@ -38,22 +41,26 @@ This is the files for gcc and newlib that are shared by all targets.
 %dir %{_includedir}
 
 %post -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/cpp.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/cppinternals.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gcc.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/libc.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/libm.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gccint.info.gz
+%if "%{gcc_version}" >= "3.4"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gccinstall.info.gz
+%endif
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gcc
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/cpp.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/cppinternals.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gcc.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/libc.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/libm.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gccint.info.gz
+%if "%{gcc_version}" >= "3.4"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gccinstall.info.gz
+%endif
+fi
 
diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add
index 095e82a8dc..eb447e609a 100644
--- a/scripts/gccnewlib/base-gcj.add
+++ b/scripts/gccnewlib/base-gcj.add
@@ -5,7 +5,9 @@
 %package -n %{rpmprefix}rtems@osversion@-base-gcj
 Summary:      base package for rtems gcc/java compiler (gcj).
 Group: %{rpmgroup}
-Requires: %{rpmprefix}rtems@osversion@-base-gcc
+
+Requires(post): 	/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gcj
 RTEMS is an open source operating system for embedded systems.
@@ -25,7 +27,10 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %if "%{gcc_version}" >= "3.3"
 %{_infodir}/fastjar.info*
 %endif
-%if "%{gcc_version}" >= "3.3" && "%{gcc_version}" <= "3.4"
+
+%if "%{gcc_version}" < "4.0"
+%if "%{gcc_version}" >= "3.3"
+%dir %{_mandir}
 %dir %{_mandir}/man1
 %{_mandir}/man1/gcjh.1*
 %{_mandir}/man1/jv-scan.1*
@@ -37,5 +42,22 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %{_mandir}/man1/jar.1*
 %{_mandir}/man1/grepjar.1*
 %endif
+%endif
+
+%post -n %{rpmprefix}rtems@osversion@-base-gcj
+/sbin/install-info --infodir=%{_infodir} %{_infodir}/gcj.info*
+
+%if "%{gcc_version}" >= "3.3"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/fastjar.info*
+%endif
+
+%postun -n %{rpmprefix}rtems@osversion@-base-gcj
+if [ $1 -eq 0 ]; then
+/sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gcj.info*
+
+%if "%{gcc_version}" >= "3.3"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/fastjar.info*
+%endif
+fi
 
 %endif
diff --git a/scripts/gccnewlib/base-gfortran.add b/scripts/gccnewlib/base-gfortran.add
index c3a6435919..fa6a5b6369 100644
--- a/scripts/gccnewlib/base-gfortran.add
+++ b/scripts/gccnewlib/base-gfortran.add
@@ -5,7 +5,9 @@
 %package -n %{rpmprefix}rtems@osversion@-base-gfortran
 Summary:      rtems base package for gcc/gfortran compiler
 Group: %{rpmgroup}
-Requires: rtems-base-gcc
+
+Requires(post): 	/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gfortran
 RTEMS is an open source operating system for embedded systems.
@@ -22,23 +24,11 @@ This is the files for gcc/gfortran that are shared by all targets.
 %{_mandir}/man1/%{gcc_target}-gfortran.1*
 
 %post -n %{rpmprefix}rtems@osversion@-base-gfortran
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gfortran
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test -n "$f" && for i in $f; do
-      install-info $i %{_infodir}/dir
-    done
-  fi
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
+fi
 
 %endif
diff --git a/scripts/gccnewlib/target-gcj.add b/scripts/gccnewlib/target-gcj.add
index 3499512524..371da665f6 100644
--- a/scripts/gccnewlib/target-gcj.add
+++ b/scripts/gccnewlib/target-gcj.add
@@ -19,20 +19,25 @@ This is the gcc/java compiler for %{gcc_target}
 %{_bindir}/%{gcc_target}-jcf-dump%{_exeext}
 %{_bindir}/%{gcc_target}-jv-scan%{_exeext}
 %{_bindir}/%{gcc_target}-gcjh%{_exeext}
-%{_mandir}/man1/%{gcc_target}-gcj.1*
 
 %if "%{gcc_version}" >= "3.4"
-%{_bindir}/%{gcc_target}-jar%{_exeext}
-%{_bindir}/%{gcc_target}-grepjar%{_exeext}
-%{_mandir}/man1/%{gcc_target}-jar.1*
-%{_mandir}/man1/%{gcc_target}-grepjar.1*
-%{_mandir}/man1/%{gcc_target}-rmic.1*
-%{_mandir}/man1/%{gcc_target}-rmiregistry.1*
-%{_mandir}/man1/%{gcc_target}-gcjh.1*
-%{_mandir}/man1/%{gcc_target}-gij.1*
+%{_bindir}/%{gcc_target}-*jar%{_exeext}
+
+%dir %{_mandir}
+%dir %{_mandir}/man1
+%{_mandir}/man1/%{gcc_target}-*jar.1*
+%{_mandir}/man1/%{gcc_target}-gcj*.1*
+%{_mandir}/man1/%{gcc_target}-jv-*.1*
 %{_mandir}/man1/%{gcc_target}-jcf-dump.1*
-%{_mandir}/man1/%{gcc_target}-jv-convert.1*
-%{_mandir}/man1/%{gcc_target}-jv-scan.1*
+%{_mandir}/man1/%{gcc_target}-gij.1*
+%endif
+
+%if "%{gcc_version}" >= "4.0"
+%{_mandir}/man1/%{gcc_target}-grmi*.1*
+%else
+%if "%{gcc_version}" >= "3.4"
+%{_mandir}/man1/%{gcc_target}-rmi*.1*
+%endif
 %endif
 
 %{gccexec}/%{gcc_target}/%{gcc_version}/jc1%{_exeext}