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

Accepting request 1070248 from home:dgarcia:branches:Base:System

Browse Source 
- Add Provides for all tty-tools binaries in the tty-tools package to
  handle conflict with previous versions of util-linux.
- Split out mesg, wall and write to their own util-linux-tty-tools
  package. (bsc#1208310)

OBS-URL: https://build.opensuse.org/request/show/1070248
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=501
This commit is contained in:
Jan Engelhardt 2023-03-08 22:17:55 +00:00 committed by Git OBS Bridge
parent c11a03c275
commit 0013ae4f06
2 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util-linux.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Mar 8 10:08:45 UTC 2023 - Daniel Garcia <daniel.garcia@suse.com>
- Add Provides for all tty-tools binaries in the tty-tools package to
handle conflict with previous versions of util-linux.
-------------------------------------------------------------------
Thu Mar 7 06:57:55 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
- Split out mesg, wall and write to their own util-linux-tty-tools
package. (bsc#1208310)
-------------------------------------------------------------------
Mon Mar 6 10:43:35 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

53
util-linux.spec
View File

@ -188,7 +188,6 @@ Recommends: login_defs-support-for-util-linux >= 2.37
# ulsubset == core
%if "%ulbuild" == "base"
Requires(pre): group(tty)
# The problem with inconsistent /proc/self/mountinfo read is fixed in kernel 5.8.
# util-linux >= 2.37 no more contain work-around.
Conflicts: kernel < 5.8
@ -361,6 +360,18 @@ Requires: libuuid-devel = %{version}
Files to develop applications using the library to generate universally
unique IDs (UUIDs).
%package -n util-linux-tty-tools
Summary: Tools for writing to TTYs
License: BSD-3-Clause
PreReq: permissions
Requires(pre): group(tty)
Provides: util-linux:%{_bindir}/mesg
Provides: util-linux:%{_bindir}/wall
Provides: util-linux:%{_bindir}/write
%description -n util-linux-tty-tools
Tools that write to TTYs that the current user does not own.
%lang_package
%endif
# ulsubset == core
@ -695,8 +706,11 @@ exit "$result"
%if "%ulsubset" == "core"
%verifyscript
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount
%verify_permissions -e %{_bindir}/mount -e %{_bindir}/umount
%verify_permissions -e %{_bindir}/su
%verifyscript -n util-linux-tty-tools
%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write
%endif
%dnl # ulsubset == core, ulbuild == base
@ -714,7 +728,7 @@ for i in login remote runuser runuser-l su su-l ; do
done
%post
%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount
%set_permissions %{_bindir}/mount %{_bindir}/umount
%set_permissions %{_bindir}/su
%if ! %{defined no_config}
@ -773,6 +787,9 @@ done
%postun -n libfdisk1 -p /sbin/ldconfig
%post -n util-linux-tty-tools
%set_permissions %{_bindir}/wall %{_bindir}/write
%endif
%dnl # ulsubset == core, pre & post
%dnl
@ -941,7 +958,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_bindir}/lsmem
%{_bindir}/lsns
%{_bindir}/mcookie
%{_bindir}/mesg
%{_bindir}/more
%verify(not mode) %attr(%ul_suid,root,root) %{_bindir}/mount
%{_bindir}/namei
@ -1008,9 +1024,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_sbindir}/swapon
%{_sbindir}/switch_root
%{_sbindir}/wipefs
%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
%{_bindir}/whereis
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_sbindir}/zramctl
%{_sbindir}/flushb
%{_sbindir}/readprofile
@ -1021,6 +1035,18 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_datadir}/bash-completion/completions/*
#
%exclude %{_datadir}/bash-completion/completions/uuidd
# tty-tools package
%exclude %{_datadir}/bash-completion/completions/wall
%exclude %{_datadir}/bash-completion/completions/write
%exclude %{_datadir}/bash-completion/completions/mesg
%exclude %{_mandir}/man1/mesg.1.gz
%exclude %{_mandir}/man1/wall.1.gz
%exclude %{_mandir}/man1/write.1.gz
%exclude %{_bindir}/mesg
%exclude %{_bindir}/wall
%exclude %{_bindir}/write
# util-linux documentation files
%doc Documentation/blkid.txt
%doc Documentation/cal.txt
@ -1346,7 +1372,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man8/lsblk.8.gz
%{_mandir}/man1/lsmem.1.gz
%{_mandir}/man1/mcookie.1.gz
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/more.1.gz
%{_mandir}/man1/namei.1.gz
%{_mandir}/man1/nsenter.1.gz
@ -1365,9 +1390,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_mandir}/man1/taskset.1.gz
%{_mandir}/man1/ul.1.gz
%{_mandir}/man1/unshare.1.gz
%{_mandir}/man1/wall.1.gz
%{_mandir}/man1/whereis.1.gz
%{_mandir}/man1/write.1.gz
%{_mandir}/man1/ipcmk.1.gz
%{_mandir}/man1/mountpoint.1.gz
%{_mandir}/man1/runuser.1.gz
@ -1462,6 +1485,18 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%{_libdir}/libuuid.so.1
%{_libdir}/libuuid.so.1.*
%files -n util-linux-tty-tools
%{_bindir}/mesg
%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall
%verify(not mode) %attr(0755,root,tty) %{_bindir}/write
%{_mandir}/man1/mesg.1.gz
%{_mandir}/man1/wall.1.gz
%{_mandir}/man1/write.1.gz
%{_datadir}/bash-completion/completions/wall
%{_datadir}/bash-completion/completions/write
%{_datadir}/bash-completion/completions/mesg
# devel, lang and uuidd files are not packaged in staging mode
# and packaged separately in full mode
# FIXME: Is it needed?