Accepting request 831052 from Base:System

OBS-URL: https://build.opensuse.org/request/show/831052
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=83
This commit is contained in:
Dominique Leuenberger 2020-09-04 08:53:46 +00:00 committed by Git OBS Bridge
commit 1ceeefbcfa
2 changed files with 17 additions and 9 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Aug 30 17:39:08 UTC 2020 - Antoine Belvire <antoine.belvire@opensuse.org>
- Fix usage of update-alternatives (boo#1175919).
-------------------------------------------------------------------
Thu Aug 27 12:59:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- Don't recommend groff-full to avoid pulling in ghostscript etc.
groff-full installs itself when there's groff and
ghostscript-library installed.
-------------------------------------------------------------------
Thu Aug 27 07:38:06 UTC 2020 - Dr. Werner Fink <werner@suse.de>

View File

@ -79,16 +79,13 @@ 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
%endif
%if 0%{?suse_version} > 1300
Recommends: groff-full
%endif
%description
A program for displaying man pages on the screen or sending them to a
@ -289,7 +286,7 @@ test -d var/catman/ && rm -rf var/catman/ || true
%endif
%endif
# Remark: soelim(1) is part of package groff or mandoc and
# makewhatis(8) is part of package makewaht or mandoc
# makewhatis(8) is part of package makewhat or mandoc
%{_sbindir}/update-alternatives --quiet --force \
--install %{_bindir}/man man %{_libexecdir}/man-db/wrapper 1010 \
--slave %{_bindir}/apropos apropos %{_libexecdir}/man-db/whatis \
@ -305,10 +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
%{_sbindir}/update-alternatives --quiet --remove man %{_bindir}/man
fi
%postun
/sbin/ldconfig
@ -318,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}