X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-linux.spec;h=745f7a48db7d480fb51922efdd9488e4946d7ec1;hb=1f98a8e0f99b91bedb07fa5f3fad1f5c81d9c94a;hp=617db4c18a404676394f37485951aaf216bf15d9;hpb=cc3d4f311e6f1f6a7b913e5cf1367b46b6cecafe;p=packages%2Futil-linux.git

diff --git a/util-linux.spec b/util-linux.spec
index 617db4c..745f7a4 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,5 +1,5 @@
 # TODO
-# - remote chfn/chsh (BR: libuser)?
+# - remote chfn/chsh (BR: libuser)? - but PLD uses pwdutils/shadow implementation currently
 # - verify initrd tools set:
 #   - I've taken list from 2.21.3 package, but there was no explicit list, so
 #     there are probably some unneeded tools
@@ -23,7 +23,7 @@
 %if "%{pld_release}" == "ac"
 %define		pam_ver 0.79.0
 %else
-%define		pam_ver 0.99.7.1
+%define		pam_ver 1:1.1.8-5
 %endif
 
 Summary:	Collection of basic system utilities for Linux
@@ -36,12 +36,12 @@ Summary(ru.UTF-8):	Набор базовых системных утилит д
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
-Version:	2.24
-Release:	3
-License:	GPL
+Version:	2.26.2
+Release:	1
+License:	GPL v2+
 Group:		Applications/System
-Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
-# Source0-md5:	4fac6443427f575fc5f3531a4ad2ca01
+Source0:	https://www.kernel.org/pub/linux/utils/util-linux/v2.26/%{name}-%{version}.tar.xz
+# Source0-md5:	9bdf368c395f1b70325d0eb22c7f48fb
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:	login.pamd
@@ -54,24 +54,23 @@ Source8:	runuser.pamd
 Source9:	runuser-l.pamd
 Source10:	nologin.c
 Source11:	nologin.8
-Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-ng-union-mount.patch
-
-Patch3:		%{name}-fdformat-ide.patch
-Patch4:		%{name}-fhs.patch
-Patch5:		%{name}-hotkeys.patch
-Patch7:		%{name}-login-lastlog.patch
-Patch8:		%{name}-procpartitions.patch
-Patch9:		su-paths.patch
-Patch10:	%{name}-diet.patch
-URL:		http://userweb.kernel.org/~kzak/util-linux/
+Source12:	blockdev.service
+Source13:	blockdev.sh
+Patch0:		%{name}-fdformat-ide.patch
+Patch1:		%{name}-fhs.patch
+Patch2:		%{name}-login-lastlog.patch
+Patch3:		%{name}-procpartitions.patch
+Patch4:		su-paths.patch
+Patch5:		%{name}-diet.patch
+URL:		https://github.com/karelzak/util-linux
 BuildRequires:	audit-libs-devel >= 1.0.6
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
-BuildRequires:	gettext-devel >= 0.14.1
+BuildRequires:	gettext-tools >= 0.14.1
 %{?with_fallocate:BuildRequires:	glibc-devel >= 6:2.11}
 BuildRequires:	gtk-doc >= 1.10
 BuildRequires:	gtk-doc-automake >= 1.10
+BuildRequires:	libcap-ng-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 2.0}
 %{?with_selinux:BuildRequires:	libsepol-devel}
 BuildRequires:	libtool >= 2:2.2
@@ -81,7 +80,7 @@ BuildRequires:	pam-devel >= %{pam_ver}
 BuildRequires:	pkgconfig
 BuildRequires:	python3-devel
 BuildRequires:	rpm >= 4.4.9-56
-BuildRequires:	rpmbuild(macros) >= 1.470
+BuildRequires:	rpmbuild(macros) >= 1.671
 BuildRequires:	sed >= 4.0
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
@@ -99,7 +98,9 @@ BuildRequires:	glibc-static
 	%endif
 %endif
 Requires:	libblkid = %{version}-%{release}
+Requires:	libfdisk = %{version}-%{release}
 %{?with_selinux:Requires:	libselinux >= 2.0}
+Requires:	libsmartcols = %{version}-%{release}
 Requires:	pam >= %{pam_ver}
 Provides:	eject = %{version}-%{release}
 Provides:	fdisk
@@ -116,12 +117,10 @@ Obsoletes:	sparc32
 Obsoletes:	util-linux-chkdupexe
 Obsoletes:	util-linux-ng < 2.20-1
 Obsoletes:	util-linux-suids
-Conflicts:	SysVinit < 2.86-26
 Conflicts:	SysVinit-tools < 2.88-15
 Conflicts:	e2fsprogs < 1.41.8-5
 Conflicts:	rc-scripts < 0.4.9-2
 Conflicts:	shadow-extras < 1:4.0.3-6
-Conflicts:	upstart-SysVinit < 2.86-28
 %if %{with su}
 Conflicts:	coreutils < 8.19
 %endif
@@ -196,8 +195,10 @@ Summary:	Support for blockdev
 Summary(pl.UTF-8):	Obsługa blockdev
 Group:		Applications/System
 Requires(post,preun):	/sbin/chkconfig
+Requires(post,preun,postun):	systemd-units >= 38
 Requires:	coreutils
 Requires:	rc-scripts >= 0.4.3.0
+Requires:	systemd-units >= 38
 
 %description -n blockdev
 The utility blockdev allows one to call block device ioctls from the
@@ -218,6 +219,7 @@ Summary(ru.UTF-8):	Программы для настройки loopback-уст
 Summary(tr.UTF-8):	Yerel-çevrim aygıtlarının kurulması ve ayarlanması için programlar
 Summary(uk.UTF-8):	Програми для конфігурації loopback-пристроїв
 Group:		Applications/System
+Requires:	libsmartcols = %{version}-%{release}
 
 %description -n losetup
 Linux supports a special block device called the loopback device,
@@ -287,7 +289,9 @@ Summary(tr.UTF-8):	Dosya sistemlerini bağlamak ve çözmek için programlar
 Summary(uk.UTF-8):	Програми для монтування та розмонтування файлових систем
 Group:		Applications/System
 Requires:	libmount = %{version}-%{release}
+Requires:	libsmartcols = %{version}-%{release}
 Conflicts:	SysVinit < 2.86-26
+Conflicts:	upstart-SysVinit < 2.86-28
 # C: nfs-utils-common is opposite to http://cvs.pld-linux.org/packages/nfs-utils/nfs-utils.spec?r1=1.165&r2=1.166
 Conflicts:	nfs-utils-common < 1.1.3-3
 
@@ -548,10 +552,52 @@ Ten pakiet zawiera działającego w przestrzeni użytkownika demona
 (uuidd) gwarantującego unikalność generowania UUID-ów opartych na
 czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
 
+%package -n libfdisk
+Summary:	fdisk library
+Summary(pl.UTF-8):	Biblioteka fdisk
+License:	LGPL v2.1+
+Group:		Libraries
+Requires:	libblkid = %{version}-%{release}
+Requires:	libuuid = %{version}-%{release}
+
+%description -n libfdisk
+fdisk library.
+
+%description -n libfdisk -l pl.UTF-8
+Biblioteka fdisk.
+
+%package -n libfdisk-devel
+Summary:	Header files for fdisk library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki fdisk
+License:	LGPL v2.1+
+Group:		Development/Libraries
+Requires:	libblkid-devel = %{version}-%{release}
+Requires:	libfdisk = %{version}-%{release}
+Requires:	libuuid-devel = %{version}-%{release}
+
+%description -n libfdisk-devel
+Header files for fdisk library.
+
+%description -n libfdisk-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki fdisk.
+
+%package -n libfdisk-static
+Summary:	Static version of fdisk library
+Summary(pl.UTF-8):	Statyczna wersja biblioteki fdisk
+License:	LGPL v2.1+
+Group:		Development/Libraries
+Requires:	libfdisk-devel = %{version}-%{release}
+
+%description -n libfdisk-static
+Static version of fdisk library.
+
+%description -n libfdisk-static -l pl.UTF-8
+Statyczna wersja biblioteki fdisk.
+
 %package -n libmount
 Summary:	Library to handle mounting-related tasks
 Summary(pl.UTF-8):	Biblioteka obsługująca zadania związane z montowaniem
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Libraries
 Requires:	libblkid = %{version}-%{release}
 
@@ -564,7 +610,7 @@ Biblioteka obsługująca zadania związane z montowaniem.
 %package -n libmount-devel
 Summary:	Header files for mount library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki mount
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	libblkid-devel = %{version}-%{release}
 Requires:	libmount = %{version}-%{release}
@@ -578,7 +624,7 @@ Pliki nagłówkowe biblioteki mount.
 %package -n libmount-static
 Summary:	Static version of mount library
 Summary(pl.UTF-8):	Statyczna wersja biblioteki mount
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Development/Libraries
 Requires:	libmount-devel = %{version}-%{release}
 
@@ -588,21 +634,18 @@ Static version of mount library.
 %description -n libmount-static -l pl.UTF-8
 Statyczna wersja biblioteki mount.
 
-%package -n libmount-dietlibc
-Summary:	Static dietlibc mount library
-Summary(pl.UTF-8):	Statyczna biblioteka mount dla dietlibc
-License:	LGPL v2.1+
-Group:		Development/Libraries
-Requires:	libblkid-devel = %{version}-%{release}
-Requires:	libblkid-dietlibc = %{version}-%{release}
-Requires:	libuuid-devel = %{version}-%{release}
-Requires:	libuuid-dietlibc = %{version}-%{release}
+%package -n python3-libmount
+Summary:	Python 3.x libmount bindings
+Summary(pl.UTF-8):	Wiązania Pythona 3.x do biblioteki libmount
+License:	LGPL v3+
+Group:		Libraries/Python
+Requires:	libmount = %{version}-%{release}
 
-%description -n libmount-dietlibc
-Static dietlibc version of mount library.
+%description -n python3-libmount
+Python 3.x libmount bindings.
 
-%description -n libmount-dietlibc -l pl.UTF-8
-Statyczna wersja biblioteki mount dla dietlibc.
+%description -n python3-libmount -l pl.UTF-8
+Wiązania Pythona 3.x do biblioteki libmount.
 
 %package -n fsck
 Summary:	Check and repair a Linux file system
@@ -616,6 +659,44 @@ Check and repair a Linux file system.
 %description -n fsck -l pl.UTF-8
 Sprawdzanie i naprawa linuksowego systemu plików.
 
+%package -n libsmartcols
+Summary:	Library to handle tables and trees
+Summary(pl.UTF-8):	Biblioteka do obsługi tabelek i drzewek
+License:	LGPL
+Group:		Libraries
+
+%description -n libsmartcols
+Library to handle tables and trees.
+
+%description -n libsmartcols -l pl.UTF-8
+Biblioteka do obsługi tabelek i drzewek.
+
+%package -n libsmartcols-devel
+Summary:	Header files for smartcols library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki smartcols
+License:	LGPL
+Group:		Development/Libraries
+Requires:	libsmartcols = %{version}-%{release}
+
+%description -n libsmartcols-devel
+Header files for smartcols library.
+
+%description -n libsmartcols-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki smartcols.
+
+%package -n libsmartcols-static
+Summary:	Static version of smartcols library
+Summary(pl.UTF-8):	Statyczna wersja biblioteki smartcols
+License:	LGPL
+Group:		Development/Libraries
+Requires:	libsmartcols-devel = %{version}-%{release}
+
+%description -n libsmartcols-static
+Static version of smartcols library.
+
+%description -n libsmartcols-static -l pl.UTF-8
+Statyczna wersja biblioteki smartcols.
+
 %package initrd
 Summary:	blkid - initrd version
 Summary(pl.UTF-8):	blkid - wersja dla initrd
@@ -647,30 +728,14 @@ Bash completion for util-linux commands.
 %description -n bash-completion-util-linux -l pl.UTF-8
 Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 
-%package -n python3-libmount
-Summary:	Python 3.x libmount bindings
-Summary(pl.UTF-8):	Wiązania Pythona 3.x do biblioteki libmount
-Group:		Libraries/Python
-Requires:	libmount = %{version}-%{release}
-
-%description -n python3-libmount
-Python 3.x libmount bindings.
-
-%description -n python3-libmount -l pl.UTF-8
-Wiązania Pythona 3.x do biblioteki libmount.
-
 %prep
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
-
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_initrd:%patch10 -p1}
+%{?with_initrd:%patch5 -p1}
 
 cp -p %{SOURCE10} nologin.c
 
@@ -729,7 +794,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 	--disable-wall \
 	--without-audit \
 	--without-ncurses \
-	--without-selinux
+	--without-selinux \
+	--without-smack
 
 # configure gets it unconditionally wrong
 %{__sed} -i -e 's/#define HAVE_WIDECHAR 1//' config.h
@@ -774,7 +840,8 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 	--with-python=3 \
 	--with-audit \
 	--with-bashcompletiondir=/usr/share/bash-completion/completions \
-	--with-selinux%{!?with_selinux:=no}
+	--with-selinux%{!?with_selinux:=no} \
+	--with-smack
 
 %{__make}
 
@@ -783,14 +850,15 @@ export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \
-	$RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}}
+	$RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}} \
+	$RPM_BUILD_ROOT{/lib/systemd/pld-helpers.d,%{systemdunitdir}}
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
-mv $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin
+%{__mv} $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir}
 
 install -p nologin $RPM_BUILD_ROOT/sbin
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8
@@ -799,8 +867,10 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/blockdev.service
+cp -p %{SOURCE13} $RPM_BUILD_ROOT/lib/systemd/pld-helpers.d/blockdev.sh
 %if %{with su}
-ln -s ../sbin/runuser  $RPM_BUILD_ROOT/bin/runuser
+ln -s ../sbin/runuser $RPM_BUILD_ROOT/bin/runuser
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/pam.d/su
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/pam.d/su-l
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/runuser
@@ -811,12 +881,17 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/runuser-l
 :> $RPM_BUILD_ROOT/var/lock/wtmpxlock
 :> $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
-for lib in blkid uuid mount; do
+for lib in blkid fdisk mount smartcols uuid; do
 	mv $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so.* $RPM_BUILD_ROOT/%{_lib}
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/lib${lib}.so.*.*.*) \
 		 $RPM_BUILD_ROOT%{_libdir}/lib${lib}.so
 done
 
+# python module
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
+# obsoleted by pkg-config (libuuid.la temporarily kept because of packages built with it)
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,fdisk,mount,smartcols}.la
+
 ln -s hwclock $RPM_BUILD_ROOT/sbin/clock
 echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8
 
@@ -853,7 +928,7 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 	$RPM_BUILD_ROOT%{_mandir}/man8/{vigr,vipw}.8 \
 	$RPM_BUILD_ROOT%{_mandir}/*/man1/{arch,chkdupexe,ddate,reset}.1 \
 	$RPM_BUILD_ROOT%{_mandir}/*/man5/nfs.5 \
-	$RPM_BUILD_ROOT%{_mandir}/*/man8/{elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8
+	$RPM_BUILD_ROOT%{_mandir}/*/man8/{cytune,elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8
 
 %ifarch sparc sparcv9 sparc64
 # programs not built on sparc
@@ -863,8 +938,6 @@ echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8
 # examples
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}/getopt/getopt-parse.*sh
 
-%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/libmount/pylibmount.la
-
 %if %{with initrd}
 install -d $RPM_BUILD_ROOT%{_libdir}/initrd
 install -p initrd/bin/* $RPM_BUILD_ROOT%{_libdir}/initrd
@@ -872,7 +945,8 @@ install -p initrd/sbin/* $RPM_BUILD_ROOT%{_libdir}/initrd
 ln -s fsck $RPM_BUILD_ROOT%{_libdir}/initrd/e2fsck
 
 # We don't need those
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/initrd/{cal,col,colcrt,colrm,column,ctrlaltdel,cytune,dmesg,flock,fsfreeze,fstrim,getopt,hexdump,ipcmk,ipcrm,ipcs,isosize,logger,lslocks,mcookie,mkfs*,readprofile,renice,rev,rtcwake,script,scriptreplay,setsid,tailf,tunelp,wdctl,whereis}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/initrd/{cal,col,colcrt,colrm,column,ctrlaltdel,dmesg,flock,fsfreeze,fstrim,getopt,hexdump,ipcmk,ipcrm,ipcs,isosize,logger,lslocks,mcookie,mkfs*,readprofile,renice,rev,rtcwake,script,scriptreplay,setsid,tailf,tunelp,wdctl,whereis}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{blkid,mount}.la
 
 %if %{with dietlibc}
 cp -a initrd/%{_lib}/lib*.a $RPM_BUILD_ROOT%{dietlibdir}
@@ -887,12 +961,20 @@ rm -rf $RPM_BUILD_ROOT
 %post -n blockdev
 /sbin/chkconfig --add blockdev
 %service blockdev restart
+%systemd_post blockdev.service
 
 %preun -n blockdev
 if [ "$1" = "0" ]; then
 	%service blockdev stop
 	/sbin/chkconfig --del blockdev
 fi
+%systemd_preun blockdev.service
+
+%postun -n blockdev
+%systemd_reload
+
+%triggerpostun -n blockdev -- blockdev < 2.24-4
+%systemd_trigger blockdev.service
 
 %post	-n libblkid -p /sbin/ldconfig
 %postun -n libblkid -p /sbin/ldconfig
@@ -902,23 +984,29 @@ fi
 
 %pre    -n uuidd
 if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
-        /usr/sbin/groupmod -n uuidd libuuid
+	/usr/sbin/groupmod -n uuidd libuuid
 fi
 %groupadd -g 222 uuidd
 if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
-        /usr/sbin/usermod -l uuidd libuuid
+	/usr/sbin/usermod -l uuidd libuuid
 fi
 %useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd
 
 %postun -n uuidd
 if [ "$1" = "0" ]; then
-        %userremove uuidd
-        %groupremove uuidd
+	%userremove uuidd
+	%groupremove uuidd
 fi
 
+%post	-n libfdisk -p /sbin/ldconfig
+%postun -n libfdisk -p /sbin/ldconfig
+
 %post	-n libmount -p /sbin/ldconfig
 %postun -n libmount -p /sbin/ldconfig
 
+%post	-n libsmartcols -p /sbin/ldconfig
+%postun -n libsmartcols -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README README.licensing Documentation misc-utils/getopt-parse.{bash,tcsh}
@@ -948,10 +1036,10 @@ fi
 %attr(755,root,root) %{_bindir}/s390*
 %{_mandir}/man8/s390*
 %endif
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 %attr(755,root,root) %{_bindir}/i386
 %{_mandir}/man8/i386*
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %attr(755,root,root) %{_bindir}/x86_64
 %{_mandir}/man8/x86_64*
 %endif
@@ -995,13 +1083,13 @@ fi
 %attr(755,root,root) /sbin/switch_root
 %endif
 %attr(755,root,root) /sbin/wipefs
+%attr(755,root,root) /sbin/zramctl
 %attr(755,root,root) %{_bindir}/cal
 %attr(755,root,root) %{_bindir}/chrt
 %attr(755,root,root) %{_bindir}/col
 %attr(755,root,root) %{_bindir}/colcrt
 %attr(755,root,root) %{_bindir}/colrm
 %attr(755,root,root) %{_bindir}/column
-%attr(755,root,root) %{_bindir}/cytune
 %attr(755,root,root) %{_bindir}/eject
 %attr(755,root,root) %{_bindir}/flock
 %{?with_fallocate:%attr(755,root,root) %{_bindir}/fallocate}
@@ -1019,6 +1107,7 @@ fi
 %attr(755,root,root) %{_bindir}/look
 %attr(755,root,root) %{_bindir}/lscpu
 %attr(755,root,root) %{_bindir}/lslocks
+%attr(755,root,root) %{_bindir}/lslogins
 %attr(755,root,root) %{_bindir}/mesg
 %attr(755,root,root) %{_bindir}/mcookie
 %attr(755,root,root) %{_bindir}/namei
@@ -1037,6 +1126,7 @@ fi
 %attr(755,root,root) %{_bindir}/tailf
 %attr(755,root,root) %{_bindir}/taskset
 %attr(755,root,root) %{_bindir}/ul
+%attr(755,root,root) %{_bindir}/uname26
 %attr(755,root,root) %{_bindir}/unshare
 %attr(755,root,root) %{_bindir}/utmpdump
 %attr(755,root,root) %{_bindir}/utmpx-dump
@@ -1048,6 +1138,9 @@ fi
 %attr(755,root,root) %{_sbindir}/resizepart
 %attr(755,root,root) %{_sbindir}/rtcwake
 
+%{systemdunitdir}/fstrim.service
+%{systemdunitdir}/fstrim.timer
+
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/chrt.1*
 %{_mandir}/man1/col.1*
@@ -1071,6 +1164,7 @@ fi
 %{_mandir}/man1/logger.1*
 %{_mandir}/man1/look.1*
 %{_mandir}/man1/lscpu.1*
+%{_mandir}/man1/lslogins.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/mesg.1*
 %{_mandir}/man1/more.1*
@@ -1100,7 +1194,6 @@ fi
 %{_mandir}/man8/lsblk.8*
 %{_mandir}/man8/chcpu.8*
 %{_mandir}/man8/ctrlaltdel.8*
-%{_mandir}/man8/cytune.8*
 %{_mandir}/man8/fdformat.8*
 %{_mandir}/man8/fsfreeze.8*
 %{_mandir}/man8/fstrim.8*
@@ -1117,8 +1210,10 @@ fi
 %{_mandir}/man8/switch_root.8*
 %endif
 %{_mandir}/man8/sulogin.8*
+%{_mandir}/man8/uname26.8*
 %{_mandir}/man8/wdctl.8*
 %{_mandir}/man8/wipefs.8*
+%{_mandir}/man8/zramctl.8*
 
 %lang(de) %{_mandir}/de/man1/kill.1*
 %lang(de) %{_mandir}/de/man1/more.1*
@@ -1137,7 +1232,6 @@ fi
 %lang(es) %{_mandir}/es/man1/ul.1*
 %lang(es) %{_mandir}/es/man1/whereis.1*
 %lang(es) %{_mandir}/es/man1/write.1*
-%lang(es) %{_mandir}/es/man8/cytune.8*
 %lang(es) %{_mandir}/es/man8/ctrlaltdel.8*
 %lang(es) %{_mandir}/es/man8/ipcrm.8*
 %lang(es) %{_mandir}/es/man8/ipcs.8*
@@ -1213,7 +1307,6 @@ fi
 %lang(ja) %{_mandir}/ja/man1/whereis.1*
 %lang(ja) %{_mandir}/ja/man1/write.1*
 %lang(ja) %{_mandir}/ja/man8/ctrlaltdel.8*
-%lang(ja) %{_mandir}/ja/man8/cytune.8*
 %lang(ja) %{_mandir}/ja/man8/dmesg.8*
 %lang(ja) %{_mandir}/ja/man8/fdformat.8*
 %lang(ja) %{_mandir}/ja/man8/ipcrm.8*
@@ -1365,9 +1458,12 @@ fi
 %attr(755,root,root) /sbin/blockdev
 %{_mandir}/man8/blockdev.8*
 %lang(ja) %{_mandir}/ja/man8/blockdev.8*
+%{systemdunitdir}/blockdev.service
+%attr(755,root,root) /lib/systemd/pld-helpers.d/blockdev.sh
 
 %files -n mount
 %defattr(644,root,root,755)
+%attr(755,root,root) /bin/findmnt
 %attr(755,root,root) /bin/mountpoint
 %attr(4755,root,root) /bin/mount
 %attr(4755,root,root) /bin/umount
@@ -1377,6 +1473,7 @@ fi
 
 %{_mandir}/man1/mountpoint.1*
 %{_mandir}/man5/fstab.5*
+%{_mandir}/man8/findmnt.8*
 %{_mandir}/man8/mount.8*
 %{_mandir}/man8/umount.8*
 %{_mandir}/man8/pivot_root.8*
@@ -1473,7 +1570,6 @@ fi
 %files -n libblkid-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libblkid.so
-%{_libdir}/libblkid.la
 %{_includedir}/blkid
 %{_pkgconfigdir}/blkid.pc
 %{_mandir}/man3/libblkid.3*
@@ -1507,10 +1603,6 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libuuid.a
 
-%files -n bash-completion-util-linux
-%defattr(644,root,root,755)
-/usr/share/bash-completion/completions/*
-
 %if %{with initrd} && %{with dietlibc}
 %files -n libuuid-dietlibc
 %defattr(644,root,root,755)
@@ -1525,18 +1617,31 @@ fi
 %{systemdunitdir}/uuidd.service
 %{systemdunitdir}/uuidd.socket
 
+%files -n libfdisk
+%defattr(644,root,root,755)
+%doc libfdisk/COPYING
+%attr(755,root,root) /%{_lib}/libfdisk.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libfdisk.so.1
+
+%files -n libfdisk-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libfdisk.so
+%{_includedir}/libfdisk
+%{_pkgconfigdir}/fdisk.pc
+
+%files -n libfdisk-static
+%defattr(644,root,root,755)
+%{_libdir}/libfdisk.a
+
 %files -n libmount
 %defattr(644,root,root,755)
+%doc libmount/COPYING
 %attr(755,root,root) /%{_lib}/libmount.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libmount.so.1
-# move to -n mount when mount starts to use libmount
-%attr(755,root,root) /bin/findmnt
-%{_mandir}/man8/findmnt.8*
 
 %files -n libmount-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmount.so
-%{_libdir}/libmount.la
 %{_includedir}/libmount
 %{_pkgconfigdir}/mount.pc
 
@@ -1544,16 +1649,34 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libmount.a
 
+%files -n python3-libmount
+%defattr(644,root,root,755)
+%dir %{py3_sitedir}/libmount
+%attr(755,root,root) %{py3_sitedir}/libmount/pylibmount.so
+%{py3_sitedir}/libmount/__init__.py
+%{py3_sitedir}/libmount/__pycache__
+
 %files -n fsck
 %defattr(644,root,root,755)
 %attr(755,root,root) /sbin/fsck
 %{_mandir}/man8/fsck.8*
 
-%files -n python3-libmount
+%files -n libsmartcols
 %defattr(644,root,root,755)
-%dir %{py3_sitedir}/libmount
-%{py3_sitedir}/libmount/__init__.py
-%attr(755,root,root) %{py3_sitedir}/libmount/pylibmount.so
+%attr(755,root,root) /%{_lib}/libsmartcols.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libsmartcols.so.1
+# common for many utilities (hexdump,cal,dmesg,fdisk,cfdisk; also libblkid,libmount?)
+%{_mandir}/man5/terminal-colors.d.5*
+
+%files -n libsmartcols-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsmartcols.so
+%{_includedir}/libsmartcols
+%{_pkgconfigdir}/smartcols.pc
+
+%files -n libsmartcols-static
+%defattr(644,root,root,755)
+%{_libdir}/libsmartcols.a
 
 %if %{with initrd}
 %files initrd
@@ -1580,3 +1703,7 @@ fi
 #%attr(755,root,root) %{_libdir}/initrd/e2fsck
 #%attr(755,root,root) %{_libdir}/initrd/fsck
 %endif
+
+%files -n bash-completion-util-linux
+%defattr(644,root,root,755)
+/usr/share/bash-completion/completions/*