Install infos using FC conventions.

3 files changed, 48 insertions, 40 deletions

diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add
index eca68ec14e..da29948912 100644
--- a/scripts/binutils/base-binutils.add
+++ b/scripts/binutils/base-binutils.add
@@ -4,7 +4,8 @@
 %package -n %{rpmprefix}rtems@osversion@-base-binutils
 Summary:      base package for rtems binutils
 Group: %{rpmgroup}
-PreReq:		/sbin/install-info
+Requires(post):		/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-binutils
 
@@ -13,24 +14,26 @@ RTEMS is an open source operating system for embedded systems.
 This is the base for binutils regardless of target CPU.
 
 %post -n %{rpmprefix}rtems@osversion@-base-binutils
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i %{_infodir}/dir
-    done
-  fi
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/as.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/bfd.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/binutils.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/ld.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/standards.info.gz
+%if "%{binutils_version}" < "2.13"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gasp.info.gz
+%endif
 
 %postun -n %{rpmprefix}rtems@osversion@-base-binutils
-  if test -d %{_infodir}; 
-  then
-    rm -f %{_infodir}/dir
-    f=`find %{_infodir} -name '*.info.gz'`
-    test x"$f" != x"" && for i in $f; do
-      /sbin/install-info $i %{_infodir}/dir
-    done
-  fi
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/as.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/bfd.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/binutils.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/ld.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/standards.info.gz
+%if "%{binutils_version}" < "2.13"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gasp.info.gz
+%endif
+fi
 
 %files -n %{rpmprefix}rtems@osversion@-base-binutils
 %defattr(-,root,root)
diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add
index 5927d88a97..771deed2b6 100644
--- a/scripts/binutils/binutils.add
+++ b/scripts/binutils/binutils.add
@@ -87,6 +87,8 @@ cd ..
   rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info*
 %endif
 
+  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
 # gzip info files
   ls $RPM_BUILD_ROOT%{_infodir}/*.info \
     $RPM_BUILD_ROOT%{_infodir}/*.info-? \
@@ -95,13 +97,6 @@ cd ..
     gzip -9qf $a 2>/dev/null; \
   done
 
-# We assume that info/dir exists when building the RPMs
-  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-  f=`find $RPM_BUILD_ROOT%{_infodir} -name '*.info.gz'`
-  test x"$f" != x"" && for i in $f; do
-    /sbin/install-info $i $RPM_BUILD_ROOT%{_infodir}/dir
-  done
-
 # gzip man pages
   gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null
 
diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add
index 1afce1f80c..11a520bd8e 100644
--- a/scripts/gdb/base-gdb.add
+++ b/scripts/gdb/base-gdb.add
@@ -5,6 +5,8 @@
 %package -n %{rpmprefix}rtems@osversion@-base-gdb
 Summary:      base package for rtems gdb
 Group: %{rpmgroup}
+Requires(post):		/sbin/install-info
+Requires(postun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gdb
 
@@ -36,21 +38,29 @@ This is the base for gdb regardless of target CPU.
 %dir %{_mandir}/man1
 
 %post -n %{rpmprefix}rtems@osversion@-base-gdb
-  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}/gdb.info.gz
+%if "%{gdb_version}" < "6.3"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/mmalloc.info.gz
+%endif
+%if "%{gdb_version}" >= "5.0"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/gdbint.info.gz
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/stabs.info.gz
+%endif
+%if "{gdb_version}" >= "6.0"
+  /sbin/install-info --infodir=%{_infodir} %{_infodir}/annotate.info.gz
+%endif
 
 %postun -n %{rpmprefix}rtems@osversion@-base-gdb
-  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}/gdb.info.gz
+%if "%{gdb_version}" < "6.3"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/mmalloc.info.gz
+%endif
+%if "%{gdb_version}" >= "5.0"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gdbint.info.gz
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/stabs.info.gz
+%endif
+%if "{gdb_version}" >= "6.0"
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/annotate.info.gz
+%endif
+fi