diff --git a/man.changes b/man.changes index 0208fe8..45e3161 100644 --- a/man.changes +++ b/man.changes @@ -1,15 +1,7 @@ ------------------------------------------------------------------- -Tue Sep 1 08:56:36 UTC 2020 - Dr. Werner Fink +Sun Aug 30 17:39:08 UTC 2020 - Antoine Belvire -- Correct registered path on removing update-alternative for group - man (boo#1175919) - -------------------------------------------------------------------- -Tue Sep 1 07:42:04 UTC 2020 - Dr. Werner Fink - -- Increase update-alternatives priority to enforce update of the - symbolic links of an already installed but with older libexecdir - configured package (boo#1175919) +- Fix usage of update-alternatives (boo#1175919). ------------------------------------------------------------------- Thu Aug 27 12:59:12 UTC 2020 - Ludwig Nussel diff --git a/man.spec b/man.spec index 47556c7..aed88f5 100644 --- a/man.spec +++ b/man.spec @@ -79,9 +79,9 @@ PreReq: coreutils PreReq: fillup Requires(post): update-alternatives Requires(posttrans): systemd +Requires(postun): update-alternatives Requires(pre): group(man) Requires(pre): user(man) -Requires(preun): update-alternatives Provides: man_db %if 0%{?suse_version} < 1500 Requires: cron @@ -288,7 +288,7 @@ test -d var/catman/ && rm -rf var/catman/ || true # Remark: soelim(1) is part of package groff or mandoc and # makewhatis(8) is part of package makewhat or mandoc %{_sbindir}/update-alternatives --quiet --force \ - --install %{_bindir}/man man %{_libexecdir}/man-db/wrapper 1020 \ + --install %{_bindir}/man man %{_libexecdir}/man-db/wrapper 1010 \ --slave %{_bindir}/apropos apropos %{_libexecdir}/man-db/whatis \ --slave %{_bindir}/whatis whatis %{_libexecdir}/man-db/whatis \ --slave %{_mandir}/man1/man.1%{?ext_man} man.1%{?ext_man} %{_mandir}/man1/man-db.1%{?ext_man} \ @@ -302,15 +302,6 @@ test -d var/catman/ && rm -rf var/catman/ || true %service_del_preun mandb.service mandb.timer %endif %endif -if test $1 -eq 0 -then - if test -x %{_prefix}/lib/man-db/wrapper - then - %{_sbindir}/update-alternatives --quiet --remove man %{_prefix}/lib/man-db/wrapper - else - %{_sbindir}/update-alternatives --quiet --remove man %{_libexecdir}/man-db/wrapper - fi -fi %postun /sbin/ldconfig @@ -320,6 +311,9 @@ fi %service_del_postun mandb.service mandb.timer %endif %endif +if [ ! -f %{_libexecdir}/man-db/wrapper ] ; then + update-alternatives --quiet --remove man %{_libexecdir}/man-db/wrapper +fi %posttrans %{?tmpfiles_create:%tmpfiles_create %{_prefix}/lib/tmpfiles.d/man-db.conf}