Accepting request 652216 from Base:System

OBS-URL: https://build.opensuse.org/request/show/652216
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=233

klogconsole.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4cd7c96ea647ad6ede62f93675acf3fa3c21ce225f9b771b82618fb2e676e4e
-size 2060

python3-libmount.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com
+
+- Update to version 2.33:
+  * choom: new command to adjust and display the current OOM-killer
+    score.
+  * libsmartcols has been improved to differentiate between
+    numbers, booleans and strings in JSON output.
+  * fstrim(8): trim all mounted filesystems from /etc/fstab
+    (-A|--fstab), new command line option --dry-run.
+  * hwclock(8) new command line option --delay.
+  * mount umount, libmount allow to mount and umount filesystem in
+    another namespace.
+  * rename(1) new command line option --interactive.
+  * setarch(8) does not require architecture when modify
+    personality like ADDR_NO_RANDOMIZE. The architecture argument
+    is optional now.
+  * command su(1) new command line option --whitelist-environment.
+  * setpriv(1) new command line option --reset-env and --pdeathsig.
+  * fdisk(8), sfdisk(8): print disk model name to simplify device
+    identification.
+  * column --table-empty-lines" allows to use empty lines in
+    formatted output.
+  * wipefs improved to postpone BLKRRPART ioctl until all magic
+    strings are wiped.
+  * script(1) extended to store more information about terminal
+    size and type to the typescript header. New command line
+    option --output-limit.
+  * libblkid provides BitLocker and basic APFS detection now.
+  * lsblk is possible to execute against /sys and /proc dumps with
+    --sysroot is specified.
+  * agetty(8) reload issue only if it is really needed
+    (bsc#1085196).
+- Drop klogconsole in favor of dmesg --console-level plus
+  setlogcons (kbd) (boo#1116277).
+
 -------------------------------------------------------------------
 Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
 

python3-libmount.spec

@@ -116,7 +116,7 @@ BuildRequires:  libmount-devel
 %endif
 %endif
 #END SECOND STAGE DEPENDENCIES
-Version:        2.32.1
+Version:        2.33
 Release:        0
 # util-linux is a base package and uuidd pre-requiring pwdutils pulls
 # that into the core build cycle.  pwdutils also pulls in the whole
@@ -125,7 +125,7 @@ Release:        0
 # these tools as well
 #!BuildIgnore:  pwdutils
 Url:            https://www.kernel.org/pub/linux/utils/util-linux/
-Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.xz
+Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz
 Source1:        util-linux-rpmlintrc
 Source4:        raw.service
 Source5:        etc.raw
@@ -135,14 +135,11 @@ Source8:        login.pamd
 Source9:        remote.pamd
 Source10:       su.pamd
 Source11:       su.default
-Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.sign
+Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign
 Source13:       %{_name}.keyring
 Source14:       runuser.pamd
 Source15:       runuser-l.pamd
 Source16:       su-l.pamd
-# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
-# TODO: split to separate package
-Source40:       klogconsole.tar.xz
 Source41:       rfkill-block@.service
 Source42:       rfkill-unblock@.service
 #
@@ -386,16 +383,12 @@ library.
 
 %endif
 %prep
-%setup -q -n %{_name}-%{version} -b 40
+%setup -q -n %{_name}-%{version}
 %patch0 -p1
 #
 
 %build
 %if %build_util_linux
-pushd ../klogconsole
-# klogconsole build
-make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}"
-popd
 #
 #BEGIN SYSTEMD SAFETY CHECK
 # With systemd, some utilities are built differently. Keep track of these
@@ -606,10 +599,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
 install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-pushd ../klogconsole
-# klogconsole install
-make install DEST=%{buildroot}
-popd
 install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
 install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
 %endif
@@ -680,12 +669,10 @@ rm -f %{buildroot}%{_sbindir}/hwclock
 #UsrMerge
 rm -f %{buildroot}/sbin/hwclock
 #EndUsrMerge
-rm -f %{buildroot}%{_sbindir}/klogconsole
 rm -f %{buildroot}%{_bindir}/setterm
 rm -f %{buildroot}%{_sbindir}/tunelp
 rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
 rm -f %{buildroot}%{_mandir}/man8/hwclock.8*
-rm -f %{buildroot}%{_mandir}/man8/klogconsole.8*
 rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
 %endif
 %ifarch ia64 %sparc m68k
@@ -860,11 +847,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
+%doc AUTHORS ChangeLog README NEWS
 %license README.licensing
 %license COPYING
-%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/*
-%license Documentation/licenses/COPYING.LGPLv2.1
-%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt
@@ -930,6 +916,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_bindir}/eject
 %{_bindir}/cal
 %{_bindir}/chmem
+%{_bindir}/choom
 %{_bindir}/chrt
 %{_bindir}/col
 %{_bindir}/colcrt
@@ -1031,6 +1018,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/kill.1.gz
 %{_mandir}/man1/su.1.gz
 %{_mandir}/man1/cal.1.gz
+%{_mandir}/man1/choom.1.gz
 %{_mandir}/man1/chrt.1.gz
 %{_mandir}/man1/col.1.gz
 %{_mandir}/man1/colcrt.1.gz
@@ -1082,6 +1070,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/runuser.1.gz
 %{_mandir}/man1/uuidgen.1.gz
 %{_mandir}/man1/uuidparse.1.gz
+%{_mandir}/man5/adjtime_config.5.gz
 %{_mandir}/man5/fstab.5.gz
 %{_mandir}/man5/terminal-colors.d.5.gz
 %{_mandir}/man8/addpart.8.gz
@@ -1174,12 +1163,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 /sbin/hwclock
 #EndUsrMerge
 %{_sbindir}/hwclock
-%attr(744,root,root) %{_sbindir}/klogconsole
 %{_bindir}/setterm
 %{_sbindir}/tunelp
 %{_mandir}/man8/fdformat.8.gz
 %{_mandir}/man8/hwclock.8.gz
-%{_mandir}/man8/klogconsole.8.gz
 %{_mandir}/man8/tunelp.8.gz
 %endif
 

util-linux-2.32.1.tar.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAltMdfIACgkQ5LcdXuw5
-woRrBw//aQiUjq1kJ5ilwNxhuRHqCwltM8aIEsV5KxT2QG71ZSaAAJy/9+T9HTjW
-/Olv2jzf2dOYsY0pZ7+mhXxiMe/Oh5IQcsoeq1AwefriMNf7CMwWmOqnR/ijSF1j
-2Ij8wCpCkroqZj1o+YYX8paaDRpfany6yahSMbBCRD6SW+e1huMuSzMp2O6KRhMG
-k8xR0Oxq+Ok4R2VW9gUrHAwDIu54D48h77Pcp9hZ4Jn86ay6i3VBvJ7AsZW62lUu
-E1Qk4P/QIXk7W5PLAcbIdaznmSDfbJmnnDln9t269fq50IKyj/fp8oYkIO5VOVZL
-PJJh7cn2uAGY5C8RCmpt6f5GpDDMVyn/K/5fSgRsYge1hRJ+Z3l/buCGr5jI3vjt
-65UuFg7eKnqHLZEp7EVB7GlMjsKT83Pllz5tVvbmP/+wH4hihYEyxcmWkFvU/ZbC
-xntvp4ciSEyXJNkNyPwhprjuUx47MqipkTXDE8OSW7LhfHcrCpDKVNBljxWhTKqP
-UUGHq1nj18RtyNz9vRtwdLh0wDmyy2pNen12qcqLVRqoJAM05C1wl3eRwEKTvThz
-ZXLEQGbuf7EIDh50hg/MXn9S4bVh4S9wnWfx5qgwGBMVZzUrAWJ7c+SLWocvaEOQ
-LoYOKTVelY12+yPUNBHmNQl3e6dtFu+e9kRRc08whdNdIi6ILBw=
-=PX83
------END PGP SIGNATURE-----

util-linux-2.32.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
-size 4561088

util-linux-2.33.tar.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEsMZNFDAcxu+u32Dk5LcdXuw5woQFAlvheV4ACgkQ5LcdXuw5
+woRfdw/9GgfVJaBZZZlH7WHdZLPqU7U1cxJBTY+c5Yp+rPiOM+S3XFYTgTR7i89o
+Bc1truq3Kg/wFPFrRuRqxNcv3eJzubNczC+acUIU/uN0BI4Nxpd9e1/AuLq6tHHo
+U5HzNRmWQpXTPEeffRX1AXBLIVC0/dwP4JtRZ8DIbBxU8G5KFYqfAX1sfk8+PxJI
+3WU/4oZkhgnbzA8CEN7ULYwmNfeReZjFYfX81kaUPbxuC/NdNRgYgq/7zY+icyxR
+tqKMvWMlv/E5JPiaAW97dwdHw6YpaDkPALqN2x/CdmbI0XCKfU8wijR37zezYntr
+J1JKXkFCYdCr54fcvJE5/6eO0/fCyhP34MXfe8nA9XpWwrVmRzQVZJNA9basjsfa
+X0ZZtI/HLRHAziRwK0SB+vOvQIa53/VpddXLKJ/nLMWK1QPP8+iDKqYlZFV0PzjK
+diZzXJS5NhxyJ/O1iSfZm2L3nEEGCQbFNA6OKKW8qSfXHRwdheVEaSBJzrp/3HEN
+6ROcDK8tz1IZym/2bjkpp7QikuwwD9Svw5PmJ5vyoxXoduAKv7MR1VPQ4kX6CQ0r
+lvjMW+k76Sb0VH+dfkzwgbAP2NqUP9uBjQWR6DbxkXMStWCmlPEwv+ADyjqQifp9
+FWAYJKGcfZXTsj/9kH5BtroHmbSirIuBzpNMAmgMC5hEHxsD/OU=
+=yq3T
+-----END PGP SIGNATURE-----

util-linux-systemd.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com
+
+- Update to version 2.33:
+  * choom: new command to adjust and display the current OOM-killer
+    score.
+  * libsmartcols has been improved to differentiate between
+    numbers, booleans and strings in JSON output.
+  * fstrim(8): trim all mounted filesystems from /etc/fstab
+    (-A|--fstab), new command line option --dry-run.
+  * hwclock(8) new command line option --delay.
+  * mount umount, libmount allow to mount and umount filesystem in
+    another namespace.
+  * rename(1) new command line option --interactive.
+  * setarch(8) does not require architecture when modify
+    personality like ADDR_NO_RANDOMIZE. The architecture argument
+    is optional now.
+  * command su(1) new command line option --whitelist-environment.
+  * setpriv(1) new command line option --reset-env and --pdeathsig.
+  * fdisk(8), sfdisk(8): print disk model name to simplify device
+    identification.
+  * column --table-empty-lines" allows to use empty lines in
+    formatted output.
+  * wipefs improved to postpone BLKRRPART ioctl until all magic
+    strings are wiped.
+  * script(1) extended to store more information about terminal
+    size and type to the typescript header. New command line
+    option --output-limit.
+  * libblkid provides BitLocker and basic APFS detection now.
+  * lsblk is possible to execute against /sys and /proc dumps with
+    --sysroot is specified.
+  * agetty(8) reload issue only if it is really needed
+    (bsc#1085196).
+- Drop klogconsole in favor of dmesg --console-level plus
+  setlogcons (kbd) (boo#1116277).
+
 -------------------------------------------------------------------
 Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
 

util-linux-systemd.spec

@@ -116,7 +116,7 @@ BuildRequires:  libmount-devel
 %endif
 %endif
 #END SECOND STAGE DEPENDENCIES
-Version:        2.32.1
+Version:        2.33
 Release:        0
 # util-linux is a base package and uuidd pre-requiring pwdutils pulls
 # that into the core build cycle.  pwdutils also pulls in the whole
@@ -125,7 +125,7 @@ Release:        0
 # these tools as well
 #!BuildIgnore:  pwdutils
 Url:            https://www.kernel.org/pub/linux/utils/util-linux/
-Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.xz
+Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz
 Source1:        util-linux-rpmlintrc
 Source4:        raw.service
 Source5:        etc.raw
@@ -135,14 +135,11 @@ Source8:        login.pamd
 Source9:        remote.pamd
 Source10:       su.pamd
 Source11:       su.default
-Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.sign
+Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign
 Source13:       %{_name}.keyring
 Source14:       runuser.pamd
 Source15:       runuser-l.pamd
 Source16:       su-l.pamd
-# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
-# TODO: split to separate package
-Source40:       klogconsole.tar.xz
 Source41:       rfkill-block@.service
 Source42:       rfkill-unblock@.service
 #
@@ -386,16 +383,12 @@ library.
 
 %endif
 %prep
-%setup -q -n %{_name}-%{version} -b 40
+%setup -q -n %{_name}-%{version}
 %patch0 -p1
 #
 
 %build
 %if %build_util_linux
-pushd ../klogconsole
-# klogconsole build
-make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}"
-popd
 #
 #BEGIN SYSTEMD SAFETY CHECK
 # With systemd, some utilities are built differently. Keep track of these
@@ -606,10 +599,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
 install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-pushd ../klogconsole
-# klogconsole install
-make install DEST=%{buildroot}
-popd
 install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
 install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
 %endif
@@ -680,12 +669,10 @@ rm -f %{buildroot}%{_sbindir}/hwclock
 #UsrMerge
 rm -f %{buildroot}/sbin/hwclock
 #EndUsrMerge
-rm -f %{buildroot}%{_sbindir}/klogconsole
 rm -f %{buildroot}%{_bindir}/setterm
 rm -f %{buildroot}%{_sbindir}/tunelp
 rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
 rm -f %{buildroot}%{_mandir}/man8/hwclock.8*
-rm -f %{buildroot}%{_mandir}/man8/klogconsole.8*
 rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
 %endif
 %ifarch ia64 %sparc m68k
@@ -860,11 +847,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
+%doc AUTHORS ChangeLog README NEWS
 %license README.licensing
 %license COPYING
-%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/*
-%license Documentation/licenses/COPYING.LGPLv2.1
-%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt
@@ -930,6 +916,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_bindir}/eject
 %{_bindir}/cal
 %{_bindir}/chmem
+%{_bindir}/choom
 %{_bindir}/chrt
 %{_bindir}/col
 %{_bindir}/colcrt
@@ -1031,6 +1018,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/kill.1.gz
 %{_mandir}/man1/su.1.gz
 %{_mandir}/man1/cal.1.gz
+%{_mandir}/man1/choom.1.gz
 %{_mandir}/man1/chrt.1.gz
 %{_mandir}/man1/col.1.gz
 %{_mandir}/man1/colcrt.1.gz
@@ -1082,6 +1070,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/runuser.1.gz
 %{_mandir}/man1/uuidgen.1.gz
 %{_mandir}/man1/uuidparse.1.gz
+%{_mandir}/man5/adjtime_config.5.gz
 %{_mandir}/man5/fstab.5.gz
 %{_mandir}/man5/terminal-colors.d.5.gz
 %{_mandir}/man8/addpart.8.gz
@@ -1174,12 +1163,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 /sbin/hwclock
 #EndUsrMerge
 %{_sbindir}/hwclock
-%attr(744,root,root) %{_sbindir}/klogconsole
 %{_bindir}/setterm
 %{_sbindir}/tunelp
 %{_mandir}/man8/fdformat.8.gz
 %{_mandir}/man8/hwclock.8.gz
-%{_mandir}/man8/klogconsole.8.gz
 %{_mandir}/man8/tunelp.8.gz
 %endif
 

util-linux.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com
+
+- Update to version 2.33:
+  * choom: new command to adjust and display the current OOM-killer
+    score.
+  * libsmartcols has been improved to differentiate between
+    numbers, booleans and strings in JSON output.
+  * fstrim(8): trim all mounted filesystems from /etc/fstab
+    (-A|--fstab), new command line option --dry-run.
+  * hwclock(8) new command line option --delay.
+  * mount umount, libmount allow to mount and umount filesystem in
+    another namespace.
+  * rename(1) new command line option --interactive.
+  * setarch(8) does not require architecture when modify
+    personality like ADDR_NO_RANDOMIZE. The architecture argument
+    is optional now.
+  * command su(1) new command line option --whitelist-environment.
+  * setpriv(1) new command line option --reset-env and --pdeathsig.
+  * fdisk(8), sfdisk(8): print disk model name to simplify device
+    identification.
+  * column --table-empty-lines" allows to use empty lines in
+    formatted output.
+  * wipefs improved to postpone BLKRRPART ioctl until all magic
+    strings are wiped.
+  * script(1) extended to store more information about terminal
+    size and type to the typescript header. New command line
+    option --output-limit.
+  * libblkid provides BitLocker and basic APFS detection now.
+  * lsblk is possible to execute against /sys and /proc dumps with
+    --sysroot is specified.
+  * agetty(8) reload issue only if it is really needed
+    (bsc#1085196).
+- Drop klogconsole in favor of dmesg --console-level plus
+  setlogcons (kbd) (boo#1116277).
+
 -------------------------------------------------------------------
 Fri Oct 26 17:24:46 CEST 2018 - sbrabec@suse.com
 

util-linux.spec

@@ -116,7 +116,7 @@ BuildRequires:  libmount-devel
 %endif
 %endif
 #END SECOND STAGE DEPENDENCIES
-Version:        2.32.1
+Version:        2.33
 Release:        0
 # util-linux is a base package and uuidd pre-requiring pwdutils pulls
 # that into the core build cycle.  pwdutils also pulls in the whole
@@ -125,7 +125,7 @@ Release:        0
 # these tools as well
 #!BuildIgnore:  pwdutils
 Url:            https://www.kernel.org/pub/linux/utils/util-linux/
-Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.xz
+Source:         https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.xz
 Source1:        util-linux-rpmlintrc
 Source4:        raw.service
 Source5:        etc.raw
@@ -135,14 +135,11 @@ Source8:        login.pamd
 Source9:        remote.pamd
 Source10:       su.pamd
 Source11:       su.default
-Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.32/util-linux-%{version}.tar.sign
+Source12:       https://www.kernel.org/pub/linux/utils/util-linux/v2.33/util-linux-%{version}.tar.sign
 Source13:       %{_name}.keyring
 Source14:       runuser.pamd
 Source15:       runuser-l.pamd
 Source16:       su-l.pamd
-# klogconsole, http://opensuse.github.com/kiwi, 7.02.25, git 859dc050
-# TODO: split to separate package
-Source40:       klogconsole.tar.xz
 Source41:       rfkill-block@.service
 Source42:       rfkill-unblock@.service
 #
@@ -386,16 +383,12 @@ library.
 
 %endif
 %prep
-%setup -q -n %{_name}-%{version} -b 40
+%setup -q -n %{_name}-%{version}
 %patch0 -p1
 #
 
 %build
 %if %build_util_linux
-pushd ../klogconsole
-# klogconsole build
-make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}"
-popd
 #
 #BEGIN SYSTEMD SAFETY CHECK
 # With systemd, some utilities are built differently. Keep track of these
@@ -606,10 +599,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
 install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
 install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
-pushd ../klogconsole
-# klogconsole install
-make install DEST=%{buildroot}
-popd
 install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
 install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
 %endif
@@ -680,12 +669,10 @@ rm -f %{buildroot}%{_sbindir}/hwclock
 #UsrMerge
 rm -f %{buildroot}/sbin/hwclock
 #EndUsrMerge
-rm -f %{buildroot}%{_sbindir}/klogconsole
 rm -f %{buildroot}%{_bindir}/setterm
 rm -f %{buildroot}%{_sbindir}/tunelp
 rm -f %{buildroot}%{_mandir}/man8/fdformat.8*
 rm -f %{buildroot}%{_mandir}/man8/hwclock.8*
-rm -f %{buildroot}%{_mandir}/man8/klogconsole.8*
 rm -f %{buildroot}%{_mandir}/man8/tunelp.8*
 %endif
 %ifarch ia64 %sparc m68k
@@ -860,11 +847,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 # Common files for all archs
 %defattr(-,root,root)
 # util-linux documentation files
+%doc AUTHORS ChangeLog README NEWS
 %license README.licensing
 %license COPYING
-%license Documentation/licenses/COPYING.BSD-3
+%license Documentation/licenses/*
-%license Documentation/licenses/COPYING.LGPLv2.1
-%license Documentation/licenses/COPYING.UCB
 %doc Documentation/blkid.txt
 %doc Documentation/cal.txt
 %doc Documentation/col.txt
@@ -930,6 +916,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_bindir}/eject
 %{_bindir}/cal
 %{_bindir}/chmem
+%{_bindir}/choom
 %{_bindir}/chrt
 %{_bindir}/col
 %{_bindir}/colcrt
@@ -1031,6 +1018,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/kill.1.gz
 %{_mandir}/man1/su.1.gz
 %{_mandir}/man1/cal.1.gz
+%{_mandir}/man1/choom.1.gz
 %{_mandir}/man1/chrt.1.gz
 %{_mandir}/man1/col.1.gz
 %{_mandir}/man1/colcrt.1.gz
@@ -1082,6 +1070,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 %{_mandir}/man1/runuser.1.gz
 %{_mandir}/man1/uuidgen.1.gz
 %{_mandir}/man1/uuidparse.1.gz
+%{_mandir}/man5/adjtime_config.5.gz
 %{_mandir}/man5/fstab.5.gz
 %{_mandir}/man5/terminal-colors.d.5.gz
 %{_mandir}/man8/addpart.8.gz
@@ -1174,12 +1163,10 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
 /sbin/hwclock
 #EndUsrMerge
 %{_sbindir}/hwclock
-%attr(744,root,root) %{_sbindir}/klogconsole
 %{_bindir}/setterm
 %{_sbindir}/tunelp
 %{_mandir}/man8/fdformat.8.gz
 %{_mandir}/man8/hwclock.8.gz
-%{_mandir}/man8/klogconsole.8.gz
 %{_mandir}/man8/tunelp.8.gz
 %endif