From 0130999422dd0a14cba0876b5a37e82f2c741688 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 3 May 2005 13:37:35 +0000 Subject: Misc. %infodir/dir handling changes. --- scripts/gccnewlib/base-g77.add | 25 ++++++++----------------- scripts/gccnewlib/base-gcc.add | 5 +++-- scripts/gccnewlib/base-gcj.add | 5 +++-- scripts/gccnewlib/base-gfortran.add | 5 +++-- scripts/gccnewlib/base-gnat.add | 5 +++-- scripts/gdb/base-gdb.add | 5 +++-- scripts/gdb/gdb.add | 8 ++++---- 7 files changed, 27 insertions(+), 31 deletions(-) (limited to 'scripts') 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 diff --git a/scripts/gdb/base-gdb.add b/scripts/gdb/base-gdb.add index 11a520bd8e..daaf1770e2 100644 --- a/scripts/gdb/base-gdb.add +++ b/scripts/gdb/base-gdb.add @@ -6,7 +6,7 @@ Summary: base package for rtems gdb Group: %{rpmgroup} Requires(post): /sbin/install-info -Requires(postun): /sbin/install-info +Requires(preun): /sbin/install-info %description -n %{rpmprefix}rtems@osversion@-base-gdb @@ -18,6 +18,7 @@ This is the base for gdb regardless of target CPU. %defattr(-,root,root) %dir %{_infodir} +%ghost %{_infodir}/dir %{_infodir}/gdb.info* # FIXME: When had mmalloc.info been removed? @@ -50,7 +51,7 @@ This is the base for gdb regardless of target CPU. /sbin/install-info --infodir=%{_infodir} %{_infodir}/annotate.info.gz %endif -%postun -n %{rpmprefix}rtems@osversion@-base-gdb +%preun -n %{rpmprefix}rtems@osversion@-base-gdb if [ $1 -eq 0 ]; then /sbin/install-info --delete --infodir=%{_infodir} %{_infodir}/gdb.info.gz %if "%{gdb_version}" < "6.3" diff --git a/scripts/gdb/gdb.add b/scripts/gdb/gdb.add index 4fa8f3ac69..42787294a6 100644 --- a/scripts/gdb/gdb.add +++ b/scripts/gdb/gdb.add @@ -53,7 +53,7 @@ BuildRequires: ncurses-devel %define _sim 0 %endif %if "%{gdb_target}" == "powerpc-rtems@osversion@" -%define _sim 0 +%define _sim 1 %endif %if "%{gdb_target}" == "sparc-rtems@osversion@" %define _sim 0 @@ -133,6 +133,9 @@ cd .. # gdb 4.18 installed this, later versions don't # Don't care about it, anymore rm -rf $RPM_BUILD_ROOT%{_infodir}/readline.info* + + rm -f $RPM_BUILD_ROOT%{_infodir}/dir + touch $RPM_BUILD_ROOT%{_infodir}/dir # gzip info files ls $RPM_BUILD_ROOT%{_infodir}/*.info \ @@ -142,8 +145,5 @@ cd .. gzip -9qf $a 2>/dev/null; \ done - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - # gzip man pages gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null -- cgit v1.2.3