diff options
| author | David Shaw <[email protected]> | 2003-08-03 00:43:29 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-08-03 00:43:29 +0000 |
| commit | f3a7f5e5739f9e5cf14bab3dee14fcc4ba240a7f (patch) | |
| tree | 20d2a8c074e8a2c779009f1e4df7041f221c4fda | |
| parent | * parse-packet.c (parse_signature): Don't give "signature packet without (diff) | |
| download | gnupg-f3a7f5e5739f9e5cf14bab3dee14fcc4ba240a7f.tar.gz gnupg-f3a7f5e5739f9e5cf14bab3dee14fcc4ba240a7f.zip | |
* 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).
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <[email protected]> + + * 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 <[email protected]> * 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 |