pool/man
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 831020 from home:1Antoine1:branches:Base:System

Browse Source 
- Fix usage of update-alternatives (boo#1175919).

OBS-URL: https://build.opensuse.org/request/show/831020
OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=121
This commit is contained in:
Dr. Werner Fink 2020-09-01 10:52:39 +00:00 committed by Git OBS Bridge
parent ae5d941225
commit 7424cffc4d
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
man.changes
View File

@ -1,15 +1,7 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 08:56:36 UTC 2020 - Dr. Werner Fink <werner@suse.de> Sun Aug 30 17:39:08 UTC 2020 - Antoine Belvire <antoine.belvire@opensuse.org>
- Correct registered path on removing update-alternative for group - Fix usage of update-alternatives (boo#1175919).
man (boo#1175919)
-------------------------------------------------------------------
Tue Sep 1 07:42:04 UTC 2020 - Dr. Werner Fink <werner@suse.de>
- Increase update-alternatives priority to enforce update of the
symbolic links of an already installed but with older libexecdir
configured package (boo#1175919)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 27 12:59:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de> Thu Aug 27 12:59:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

16
man.spec
View File

@ -79,9 +79,9 @@ PreReq: coreutils
PreReq: fillup PreReq: fillup
Requires(post): update-alternatives Requires(post): update-alternatives
Requires(posttrans): systemd Requires(posttrans): systemd
Requires(postun): update-alternatives
Requires(pre): group(man) Requires(pre): group(man)
Requires(pre): user(man) Requires(pre): user(man)
Requires(preun): update-alternatives
Provides: man_db Provides: man_db
%if 0%{?suse_version} < 1500 %if 0%{?suse_version} < 1500
Requires: cron 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 # Remark: soelim(1) is part of package groff or mandoc and
# makewhatis(8) is part of package makewhat or mandoc # makewhatis(8) is part of package makewhat or mandoc
%{_sbindir}/update-alternatives --quiet --force \ %{_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}/apropos apropos %{_libexecdir}/man-db/whatis \
--slave %{_bindir}/whatis whatis %{_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} \ --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 %service_del_preun mandb.service mandb.timer
%endif %endif
%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 %postun
/sbin/ldconfig /sbin/ldconfig
@ -320,6 +311,9 @@ fi
%service_del_postun mandb.service mandb.timer %service_del_postun mandb.service mandb.timer
%endif %endif
%endif %endif
if [ ! -f %{_libexecdir}/man-db/wrapper ] ; then
update-alternatives --quiet --remove man %{_libexecdir}/man-db/wrapper
fi
%posttrans %posttrans
%{?tmpfiles_create:%tmpfiles_create %{_prefix}/lib/tmpfiles.d/man-db.conf} %{?tmpfiles_create:%tmpfiles_create %{_prefix}/lib/tmpfiles.d/man-db.conf}