Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2020-01-12 23:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages (Old) and /work/SRC/openSUSE:Factory/.man-pages.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man-pages" Sun Jan 12 23:18:15 2020 rev:135 rq:762803 version:5.04 Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2019-12-11 12:04:23.200758991 +0100 +++ /work/SRC/openSUSE:Factory/.man-pages.new.6675/man-pages.changes 2020-01-12 23:18:56.366695307 +0100 @@ -1,0 +2,14 @@ +Fri Jan 10 11:31:23 UTC 2020 - [email protected] + +- do not install man7/bpf-helpers.7 as it is already part of + bpftool package + +------------------------------------------------------------------- +Fri Jan 10 10:42:38 UTC 2020 - Ludwig Nussel <[email protected]> + +- don't use alternatives for man.7, just move it to a different directory + (boo#1160568) +- use packageand to supplement the documentation pattern instead of + unconditionally hooking on man. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.R9okXT/_old 2020-01-12 23:18:58.290696018 +0100 +++ /var/tmp/diff_new_pack.R9okXT/_new 2020-01-12 23:18:58.290696018 +0100 @@ -1,7 +1,7 @@ # # spec file for package man-pages # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,10 +33,7 @@ # [bsc#1154701] Patch6: man-pages-tcp_fack.patch BuildRequires: fdupes -BuildRequires: update-alternatives -Requires(post): update-alternatives -Requires(postun): update-alternatives -Supplements: man +Supplements: packageand(man:patterns-base-documentation) BuildArch: noarch %description @@ -66,9 +63,14 @@ rm man3/{getifaddrs.3,freeifaddrs.3,crypt.3,crypt_r.3} # remove .so link to bzero.3, conflicts with libbsd rm man3/explicit_bzero.3 +# already in bpftool package +rm man7/bpf-helpers.7 +# conflicts with mandoc +mkdir man7mp +mv man7/man.7 man7mp/man.7mp %install -for i in man? ; do +for i in man[0-9]*; do mkdir -p "%{buildroot}/%{_mandir}/$i" cp -p "$i"/* "%{buildroot}/%{_mandir}/$i/" done @@ -93,30 +95,13 @@ exit "$RETVAL" fi -# Prepare alternatives -mkdir -p %{buildroot}%{_sysconfdir}/alternatives -from=$(readlink -f %{buildroot}%{_mandir}/man7/man.7*) -to=$(echo $from|sed -e 's!\.7$!!')-mp.7 -mv -v "$from" "$to" -ln -s -f %{_sysconfdir}/alternatives/man.7 "$from" - # Remove duplicates %fdupes -s %{buildroot}/%{_prefix} -%post -update-alternatives --install \ - %{_mandir}/man7/man.7%{?ext_man} man.7%{?ext_man} \ - %{_mandir}/man7/man-mp.7%{?ext_man} 500 - -%preun -if [ $1 -eq 0 ] ; then - update-alternatives --remove man.7%{?ext_man} %{_mandir}/man7/man-mp.7%{?ext_man} -fi - %files %defattr(644,root,root,755) +%dir %{_mandir}/man7mp %{_mandir}/man*/*.gz -%ghost %{_sysconfdir}/alternatives/man.7%{?ext_man} %doc README Changes Changes.old %doc man-pages-*.Announce %doc man-pages-*.lsm
