From f3a7f5e5739f9e5cf14bab3dee14fcc4ba240a7f Mon Sep 17 00:00:00 2001 From: David Shaw Date: Sun, 3 Aug 2003 00:43:29 +0000 Subject: [PATCH] * gnupg.spec.in: Make sure that install-info is called in such a way that doesn't bork the RPM install if it cannot complete (necessary for some upgrade scenarios). --- scripts/ChangeLog | 6 ++++++ scripts/gnupg.spec.in | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index a58399ce5..652e07fa4 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2003-08-01 David Shaw + + * gnupg.spec.in: Make sure that install-info is called in such a + way that doesn't bork the RPM install if it cannot complete + (necessary for some upgrade scenarios). + 2003-07-31 David Shaw * gnupg.spec.in: Rework much of the spec to use %-macros diff --git a/scripts/gnupg.spec.in b/scripts/gnupg.spec.in index e42ce4917..844e9bda6 100644 --- a/scripts/gnupg.spec.in +++ b/scripts/gnupg.spec.in @@ -184,13 +184,15 @@ rm %{buildroot}%{_infodir}/dir %attr (0755,root,root) %{_libexecdir}/* %post -/sbin/install-info %{_infodir}/gpg.info %{_infodir}/dir -/sbin/install-info %{_infodir}/gpgv.info %{_infodir}/dir +/sbin/install-info %{_infodir}/gpg.info %{_infodir}/dir 2>/dev/null || : +/sbin/install-info %{_infodir}/gpgv.info %{_infodir}/dir 2>/dev/null || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/gpg.info %{_infodir}/dir - /sbin/install-info --delete %{_infodir}/gpgv.info %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/gpg.info \ + %{_infodir}/dir 2>/dev/null || : + /sbin/install-info --delete %{_infodir}/gpgv.info \ + %{_infodir}/dir 2>/dev/null || : fi %clean