From 07b426161b9a30dd0a6f826b2d0af4a3dcc84a20d0fb29437951fe5df9c62dac Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Tue, 1 Sep 2020 07:46:17 +0000 Subject: [PATCH 1/4] boo#1175919 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=118 --- man.changes | 7 +++++++ man.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/man.changes b/man.changes index 9892011..d693f0f 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 07:38:06 UTC 2020 - Dr. Werner Fink <werner@suse.de> diff --git a/man.spec b/man.spec index 03c90af..fd7f677 100644 --- a/man.spec +++ b/man.spec @@ -289,9 +289,9 @@ 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 \ + --install %{_bindir}/man man %{_libexecdir}/man-db/wrapper 1020 \ --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} \ From 59a3b366f057e52a8eae05643ca73021a6a127555b0615c15bbf6e01ac348432 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Tue, 1 Sep 2020 07:47:10 +0000 Subject: [PATCH 2/4] Accepting request 829994 from home:lnussel:branches:Base:System - Don't recommend groff-full to avoid pulling in ghostscript etc. groff-full installs itself when there's groff and ghostscript-library installed. OBS-URL: https://build.opensuse.org/request/show/829994 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=119 --- man.changes | 7 +++++++ man.spec | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/man.changes b/man.changes index d693f0f..be15c4e 100644 --- a/man.changes +++ b/man.changes @@ -5,6 +5,13 @@ Tue Sep 1 07:42:04 UTC 2020 - Dr. Werner Fink <werner@suse.de> 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> + +- 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> diff --git a/man.spec b/man.spec index fd7f677..6b65c9b 100644 --- a/man.spec +++ b/man.spec @@ -86,9 +86,6 @@ 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 From ae5d9412252fe3bc4db6cd3f76566de576098ec336f4cac7fd94efc7ed381782 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Tue, 1 Sep 2020 09:07:40 +0000 Subject: [PATCH 3/4] boo#1175919 OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=120 --- man.changes | 6 ++++++ man.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/man.changes b/man.changes index be15c4e..0208fe8 100644 --- a/man.changes +++ b/man.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 1 08:56:36 UTC 2020 - Dr. Werner Fink <werner@suse.de> + +- Correct registered path on removing update-alternative for group + man (boo#1175919) + ------------------------------------------------------------------- Tue Sep 1 07:42:04 UTC 2020 - Dr. Werner Fink <werner@suse.de> diff --git a/man.spec b/man.spec index 6b65c9b..47556c7 100644 --- a/man.spec +++ b/man.spec @@ -304,7 +304,12 @@ test -d var/catman/ && rm -rf var/catman/ || true %endif if test $1 -eq 0 then - %{_sbindir}/update-alternatives --quiet --remove man %{_bindir}/man + 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 From 7424cffc4d3cb3212c15c61195cdf237c4c138e3f98af0b3478860bbe22cd8f6 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" <werner@suse.com> Date: Tue, 1 Sep 2020 10:52:39 +0000 Subject: [PATCH 4/4] Accepting request 831020 from home:1Antoine1:branches:Base:System - 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 --- man.changes | 12 ++---------- man.spec | 16 +++++----------- 2 files changed, 7 insertions(+), 21 deletions(-) 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 <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 - 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) +- Fix usage of update-alternatives (boo#1175919). ------------------------------------------------------------------- Thu Aug 27 12:59:12 UTC 2020 - Ludwig Nussel <lnussel@suse.de> 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}