Misc. %infodir/dir handling changes.

5 files changed, 20 insertions, 25 deletions

diff --git a/scripts/gccnewlib/base-g77.add b/scripts/gccnewlib/base-g77.add
index 9c15804086..077be449f7 100644
--- a/scripts/gccnewlib/base-g77.add
+++ b/scripts/gccnewlib/base-g77.add
@@ -6,6 +6,8 @@
 Summary:      rtems base package for gcc/g77 compiler
 Group: %{rpmgroup}
 Requires: rtems-base-gcc
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-g77
 RTEMS is an open source operating system for embedded systems.
@@ -15,6 +17,7 @@ This is the files for gcc/g77 that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-g77
 %defattr(-,root,root)
 %dir %{_infodir}
+%ghost %{_infodir}/dir
 %{_infodir}/g77.info*.gz
 
 %dir %{_mandir}
@@ -22,23 +25,11 @@ This is the files for gcc/g77 that are shared by all targets.
 %{_mandir}/man1/%{gcc_target}-g77.1*
 
 %post -n %{rpmprefix}rtems@osversion@-base-g77
-  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}/g77.info.gz 
 
-%postun -n %{rpmprefix}rtems@osversion@-base-g77
-  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
+%preun -n %{rpmprefix}rtems@osversion@-base-g77
+if [ $1 -eq 0 ]; then
+  /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/g77.info.gz
+fi
 
 %endif
diff --git a/scripts/gccnewlib/base-gcc.add b/scripts/gccnewlib/base-gcc.add
index 48d83d1fe6..cd84dd1213 100644
--- a/scripts/gccnewlib/base-gcc.add
+++ b/scripts/gccnewlib/base-gcc.add
@@ -6,7 +6,7 @@ Summary:      	base package for rtems gcc and newlib C Library
 Group: %{rpmgroup}
 
 Requires(post): 	/sbin/install-info
-Requires(postun):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gcc
 
@@ -17,6 +17,7 @@ This is the files for gcc and newlib that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-gcc
 %defattr(-,root,root)
 %dir %{_infodir}
+%ghost %{_infodir}/dir
 %{_infodir}/cpp.info*
 %{_infodir}/cppinternals.info*
 %{_infodir}/gcc.info*
@@ -51,7 +52,7 @@ This is the files for gcc and newlib that are shared by all targets.
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gccinstall.info.gz
 %endif
 
-%postun -n %{rpmprefix}rtems@osversion@-base-gcc
+%preun -n %{rpmprefix}rtems@osversion@-base-gcc
 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
diff --git a/scripts/gccnewlib/base-gcj.add b/scripts/gccnewlib/base-gcj.add
index eb447e609a..077680e523 100644
--- a/scripts/gccnewlib/base-gcj.add
+++ b/scripts/gccnewlib/base-gcj.add
@@ -7,7 +7,7 @@ Summary:      base package for rtems gcc/java compiler (gcj).
 Group: %{rpmgroup}
 
 Requires(post): 	/sbin/install-info
-Requires(postun):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gcj
 RTEMS is an open source operating system for embedded systems.
@@ -23,6 +23,7 @@ This is the files for gcc/java (gcj) that are shared by all targets.
 %endif
 
 %dir %{_infodir}
+%ghost %{_infodir}/dir
 %{_infodir}/gcj.info*
 %if "%{gcc_version}" >= "3.3"
 %{_infodir}/fastjar.info*
@@ -51,7 +52,7 @@ This is the files for gcc/java (gcj) that are shared by all targets.
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/fastjar.info*
 %endif
 
-%postun -n %{rpmprefix}rtems@osversion@-base-gcj
+%preun -n %{rpmprefix}rtems@osversion@-base-gcj
 if [ $1 -eq 0 ]; then
 /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gcj.info*
 
diff --git a/scripts/gccnewlib/base-gfortran.add b/scripts/gccnewlib/base-gfortran.add
index 30116d76a8..1094be1368 100644
--- a/scripts/gccnewlib/base-gfortran.add
+++ b/scripts/gccnewlib/base-gfortran.add
@@ -7,7 +7,7 @@ Summary:      rtems base package for gcc/gfortran compiler
 Group: %{rpmgroup}
 
 Requires(post): 	/sbin/install-info
-Requires(postun):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gfortran
 RTEMS is an open source operating system for embedded systems.
@@ -17,6 +17,7 @@ This is the files for gcc/gfortran that are shared by all targets.
 %files -n %{rpmprefix}rtems@osversion@-base-gfortran
 %defattr(-,root,root)
 %dir %{_infodir}
+%ghost %{_infodir}/dir
 %{_infodir}/gfortran.info*.gz
 
 %dir %{_mandir}
@@ -26,7 +27,7 @@ This is the files for gcc/gfortran that are shared by all targets.
 %post -n %{rpmprefix}rtems@osversion@-base-gfortran
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
 
-%postun -n %{rpmprefix}rtems@osversion@-base-gfortran
+%preun -n %{rpmprefix}rtems@osversion@-base-gfortran
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gfortran.info.gz
 fi
diff --git a/scripts/gccnewlib/base-gnat.add b/scripts/gccnewlib/base-gnat.add
index a872784fe2..3050af9361 100644
--- a/scripts/gccnewlib/base-gnat.add
+++ b/scripts/gccnewlib/base-gnat.add
@@ -7,7 +7,7 @@ Summary:	gcc/gnat tools
 Group: %{rpmgroup}
 
 Requires(post): 	/sbin/install-info
-Requires(postun):	/sbin/install-info
+Requires(preun):	/sbin/install-info
 
 %description -n %{rpmprefix}rtems@osversion@-base-gnat
 RTEMS is an open source operating system for embedded systems.
@@ -20,6 +20,7 @@ This is the gcc/gnat tools for the gcc/gnat compiler
 %{_bindir}/vxaddr2line%{_exeext}
 
 %dir %{_infodir}
+%ghost %{_infodir}/dir
 %{_infodir}/gnat*
 
 %post -n %{rpmprefix}rtems@osversion@-base-gnat
@@ -27,7 +28,7 @@ This is the gcc/gnat tools for the gcc/gnat compiler
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz
   /sbin/install-info --infodir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz
 
-%postun -n %{rpmprefix}rtems@osversion@-base-gnat
+%preun -n %{rpmprefix}rtems@osversion@-base-gnat
 if [ $1 -eq 0 ]; then
   /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat_rm.info.gz
   /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gnat-style.info.gz