From 29eb9a363a16d74c5a378bfbc37e0723cf8478cc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 2 May 2005 08:09:22 +0000 Subject: 2005-05-02 Ralf Corsepius * binutils/base-binutils.add, binutils/binutils.add: Misc %infodir/dir handling changes. --- scripts/ChangeLog | 5 +++++ scripts/binutils/base-binutils.add | 6 +++--- scripts/binutils/binutils.add | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 2e05eecd2a..23ef0575ff 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2005-05-02 Ralf Corsepius + + * binutils/base-binutils.add, binutils/binutils.add: + Misc %infodir/dir handling changes. + 2005-05-02 Ralf Corsepius * configure.ac: Reflect changes to autotools/*. diff --git a/scripts/binutils/base-binutils.add b/scripts/binutils/base-binutils.add index da29948912..f58b547037 100644 --- a/scripts/binutils/base-binutils.add +++ b/scripts/binutils/base-binutils.add @@ -5,7 +5,7 @@ Summary: base package for rtems binutils Group: %{rpmgroup} Requires(post): /sbin/install-info -Requires(postun): /sbin/install-info +Requires(preun): /sbin/install-info %description -n %{rpmprefix}rtems@osversion@-base-binutils @@ -23,7 +23,7 @@ This is the base for binutils regardless of target CPU. /sbin/install-info --infodir=%{_infodir} %{_infodir}/gasp.info.gz %endif -%postun -n %{rpmprefix}rtems@osversion@-base-binutils +%preun -n %{rpmprefix}rtems@osversion@-base-binutils 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 @@ -38,6 +38,7 @@ fi %files -n %{rpmprefix}rtems@osversion@-base-binutils %defattr(-,root,root) %dir %{_infodir} +%ghost %{_infodir}/dir %{_infodir}/as.info* %{_infodir}/bfd.info* %{_infodir}/binutils.info* @@ -50,4 +51,3 @@ fi %dir %{_prefix}/share %dir %{_prefix}/share/locale - diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 771deed2b6..3fbfd99bb3 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -88,6 +88,7 @@ cd .. %endif rm -f $RPM_BUILD_ROOT%{_infodir}/dir + touch $RPM_BUILD_ROOT%{_infodir}/dir # gzip info files ls $RPM_BUILD_ROOT%{_infodir}/*.info \ -- cgit v1.2.3