X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-linux.spec;h=3adc4161c9bf484dfbeb58dd6d57270bf154cf95;hb=232bdb1aa2ccb366530735e18678f22ef68813fa;hp=60be30d76cb8b736fe6b49d9c3dba4860c8cca62;hpb=67de32db82d9b7bfb98c52c116e1ca00f3ef07ad;p=packages%2Futil-linux.git diff --git a/util-linux.spec b/util-linux.spec index 60be30d..3adc416 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,11 +1,19 @@ +# TODO +# - 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 +# - chrt is not built now (because of --disable-schedutils), but it's probably not needed +# - fsck is not built now (because of --disable-libmount) +# - maybe we want some more now? # # Conditional build: -%bcond_with uClibc # link initrd version with static glibc instead of uClibc +%bcond_with uClibc # link initrd version with static glibc instead of uClibc %bcond_without dietlibc # link initrd version with dietlibc instead of uClibc %bcond_without selinux # SELinux support +%bcond_without su # su/runuser programs %if "%{pld_release}" == "ac" -%bcond_with initrd # don't build initrd version -%bcond_with fallocate # fallocate utility (needs glibc 2.11 to compile) +%bcond_with initrd # don't build initrd version +%bcond_with fallocate # fallocate utility (needs glibc 2.11 to compile) %else %bcond_without initrd # don't build initrd version %bcond_without fallocate # fallocate utility (needs glibc 2.11 to compile) @@ -26,38 +34,47 @@ Summary(pt_BR.UTF-8): Coletânea de utilitários básicos de sistema para Linux Summary(ru.UTF-8): Набор базовых системных утилит для Linux Summary(tr.UTF-8): Temel sistem araçları Summary(uk.UTF-8): Набір базових системних утиліт для Linux -Name: util-linux-ng -Version: 2.19 +Name: util-linux +Version: 2.23.1 Release: 0.1 License: GPL Group: Applications/System -Source0: http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{version}.tar.bz2 -# Source0-md5: 590ca71aad0b254e2631d84401f28255 -Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2 +Source0: https://www.kernel.org/pub/linux/utils/util-linux/v2.23/%{name}-%{version}.tar.xz +# Source0-md5: 33ba55ce82f8e3b8d7a38fac0f62779a +Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe Source2: login.pamd -Source3: util-linux-blockdev.init -Source4: util-linux-blockdev.sysconfig -Patch0: %{name}-ppc.patch -Patch1: %{name}-union-mount.patch -Patch2: util-linux-ctrlaltdel-man.patch -Patch3: util-linux-fdformat-ide.patch -Patch4: util-linux-fhs.patch -Patch5: util-linux-hotkeys.patch -Patch7: util-linux-login-lastlog.patch -Patch8: util-linux-procpartitions.patch -Patch9: util-linux-swaponsymlink.patch -Patch10: util-linux-diet.patch +Source3: %{name}-blockdev.init +Source4: %{name}-blockdev.sysconfig +Source5: blockdev.upstart +Source6: su.pamd +Source7: su-l.pamd +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 +# Patch11-md5: 2a37a871117466841edb3e8be692825b URL: http://userweb.kernel.org/~kzak/util-linux/ BuildRequires: audit-libs-devel >= 1.0.6 -BuildRequires: autoconf +BuildRequires: autoconf >= 2.60 BuildRequires: automake >= 1:1.10 -BuildRequires: gettext-devel +BuildRequires: gettext-devel >= 0.14.1 %{?with_fallocate:BuildRequires: glibc-devel >= 6:2.11} -BuildRequires: gtk-doc-automake +BuildRequires: gtk-doc >= 1.10 +BuildRequires: gtk-doc-automake >= 1.10 %{?with_selinux:BuildRequires: libselinux-devel} %{?with_selinux:BuildRequires: libsepol-devel} -BuildRequires: libtool +BuildRequires: libtool >= 2:2.2 BuildRequires: linux-libc-headers >= 7:2.6.27 BuildRequires: ncurses-devel >= 5.0 BuildRequires: pam-devel >= %{pam_ver} @@ -65,34 +82,46 @@ BuildRequires: pkgconfig BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.470 BuildRequires: sed >= 4.0 +BuildRequires: tar >= 1:1.22 +BuildRequires: udev-devel +BuildRequires: xz BuildRequires: zlib-devel %if %{with initrd} %if %{with uClibc} BuildRequires: uClibc-static >= 2:0.9.29 %else %if %{with dietlibc} -BuildRequires: dietlibc-static >= 2:0.32-7 +BuildRequires: dietlibc-static >= 2:0.32-14 %else BuildRequires: glibc-static %endif %endif %endif +Requires: libblkid = %{version}-%{release} Requires: pam >= %{pam_ver} +Provides: eject = %{version}-%{release} Provides: fdisk Provides: linux32 Provides: sparc32 -Provides: util-linux = %{version}-%{release} Obsoletes: cramfs +Obsoletes: eject Obsoletes: ionice Obsoletes: linux32 Obsoletes: rawdevices Obsoletes: schedutils Obsoletes: setarch Obsoletes: sparc32 -Obsoletes: util-linux +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-9 Conflicts: e2fsprogs < 1.41.8-5 Conflicts: shadow-extras < 1:4.0.3-6 +Conflicts: upstart-SysVinit < 2.86-28 +%if %{with su} +Conflicts: coreutils < 8.19 +%endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define debugcflags -O1 -g @@ -165,7 +194,7 @@ Summary(pl.UTF-8): Obsługa blockdev Group: Applications/System Requires(post,preun): /sbin/chkconfig Requires: coreutils -Requires: rc-scripts +Requires: rc-scripts >= 0.4.3.0 %description -n blockdev The utility blockdev allows one to call block device ioctls from the @@ -254,6 +283,9 @@ Summary(ru.UTF-8): Программы для монтирования и раз Summary(tr.UTF-8): Dosya sistemlerini bağlamak ve çözmek için programlar Summary(uk.UTF-8): Програми для монтування та розмонтування файлових систем Group: Applications/System +Requires: libmount = %{version}-%{release} +Conflicts: SysVinit < 2.86-26 +# 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 %description -n mount @@ -311,23 +343,6 @@ sisteminizin işlevselliği açısından kritiktir. дерева. Swapon та swapoff, відповідно, дозволяє та заборонює свопінг у визначені файли або пристрої. -%package chkdupexe -Summary: chkdupexe - find duplicate executables -Summary(pl.UTF-8): chkdupexe odszukuje powtarzające się pliki uruchamialne -Group: Applications/System -Provides: util-linux-chkdupexe = %{version}-%{release} -Obsoletes: util-linux-chkdupexe - -%description chkdupexe -chkdupexe will scan the union of $PATH and a hardcoded list of common -locations for binaries. It will report dangling symlinks and -duplicately-named binaries. - -%description chkdupexe -l pl.UTF-8 -chkdupexe przeszukuje katalogi z $PATH oraz inne powszechnie znane -katalogi z plikami uruchamialnymi i informuje o powtarzających się -plikach w różnych katalogach. - %package -n tunelp Summary: Configures kernel parallel port driver Summary(de.UTF-8): Konfiguriert den Kerneltreiber für den parallelen Port @@ -388,7 +403,7 @@ Summary(pl.UTF-8): Biblioteka do obsługi identyfikacji urządzeń License: LGPL v2.1+ Group: Libraries Requires: libuuid = %{version}-%{release} -Obsoletes: util-linux-ng-libs +Obsoletes: util-linux-ng-libs < 2.20-1 %description -n libblkid Library to handle device identification and token extraction. @@ -403,7 +418,7 @@ License: LGPL v2.1+ Group: Development/Libraries Requires: libblkid = %{version}-%{release} Requires: libuuid-devel = %{version}-%{release} -Obsoletes: util-linux-ng-devel +Obsoletes: util-linux-ng-devel < 2.20-1 %description -n libblkid-devel Header files for blkid library. @@ -418,7 +433,7 @@ License: LGPL v2.1+ Group: Development/Libraries Requires: libblkid-devel = %{version}-%{release} Requires: libuuid-static = %{version}-%{release} -Obsoletes: util-linux-ng-static +Obsoletes: util-linux-ng-static < 2.20-1 %description -n libblkid-static Static library to handle device identification and token extraction. @@ -513,7 +528,9 @@ Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/groupmod Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod +Requires(post,preun,postun): systemd-units >= 38 Requires: libuuid = %{version}-%{release} +Requires: systemd-units >= 38 Provides: group(uuidd) Provides: user(uuidd) Conflicts: libuuid < 1.40.5-0.1 @@ -588,6 +605,7 @@ Statyczna wersja biblioteki mount dla dietlibc. Summary: Check and repair a Linux file system Summary(pl.UTF-8): Sprawdzanie i naprawa linuksowego systemu plików Group: Applications/System +Requires: libblkid = %{version}-%{release} %description -n fsck Check and repair a Linux file system. @@ -599,6 +617,7 @@ Sprawdzanie i naprawa linuksowego systemu plików. Summary: blkid - initrd version Summary(pl.UTF-8): blkid - wersja dla initrd Group: Base +Obsoletes: util-linux-ng-initrd < 2.20-1 Conflicts: geninitrd < 10000.10 %description initrd @@ -609,20 +628,35 @@ or UUID - staticaly linked for initrd. Pakiet ten zawiera narzędzie blkid do rozpoznawania partycji przez etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd. +%package -n bash-completion-util-linux +Summary: bash completion for util-linux +Summary(pl.UTF-8): Dopełnienia basha dla util-linux +Group: Applications/Shells +Requires: %{name} = %{version}-%{release} +Requires: bash-completion + +%description -n bash-completion-util-linux +Bash completion for util-linux. + +%description -n bash-completion-util-linux -l pl.UTF-8 +Dopełnienia basha dla util-linux. + %prep -%setup -q -a1 -n util-linux-%{version} -%patch0 -p1 +%setup -q -a1 +#%patch0 -p1 %patch1 -p1 -%patch2 -p1 + %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 +%{?with_initrd:%patch10 -p1} -sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac +install %{SOURCE10} nologin.c + +%{__rm} po/stamp-po %build %{__gettextize} @@ -635,42 +669,64 @@ sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac export CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -DHAVE_LSEEK64_PROTOTYPE -DHAVE_LLSEEK_PROTOTYPE" %if %{with initrd} %{?with_uClibc:xCC="%{_target_cpu}-uclibc-gcc"} -%{?with_dietlibc:xCC="diet %{__cc}"; xCC=${xCC#*ccache }} +%{?with_dietlibc:xCC="%{__cc}"; xCC="diet ${xCC#*ccache }"} %configure \ %if %{with dietlibc} - ac_cv_header_crypt_h="no" \ + ac_cv_header_crypt_h=no \ + ac_cv_header_stdio_ext_h=no \ %endif CC="$xCC" \ +%if "%{?configure_cache}" == "1" + --cache-file=%{?configure_cache_file}%{!?configure_cache_file:configure}-initrd.cache \ +%endif + --exec-prefix= \ + --bindir=/bin \ + --sbindir=/sbin \ + --libdir=/%{_lib} \ --disable-shared \ --enable-static \ - --disable-fsck \ - --disable-login-utils \ + --disable-agetty \ + --disable-chfn-chsh \ + --disable-cramfs \ + --disable-kill \ + --disable-ldattach \ + --disable-libmount \ + --disable-login \ + --disable-losetup \ + --disable-minix \ + --disable-newgrp \ + --disable-partx \ + --disable-raw \ + --disable-runuser \ --disable-schedutils \ + --disable-setarch \ --disable-silent-rules \ + --disable-su \ + --disable-sulogin \ + --disable-tunelp \ --disable-use-tty-group \ + --disable-utmpdump \ + --disable-uuidd \ + --disable-vipw \ --disable-wall \ --without-audit \ --without-ncurses \ - --without-pam \ --without-selinux # configure gets it unconditionally wrong -sed -i -e 's/#define HAVE_WIDECHAR 1//' config.h +%{__sed} -i -e 's/#define HAVE_WIDECHAR 1//' config.h -sed -i -e 's/ cal\$(EXEEXT) / /; s/ lsblk\$(EXEEXT)//' misc-utils/Makefile +%{__make} \ +%if %{with uClibc} + LDFLAGS="-Wl,-static" +%endif +%if %{with dietlibc} + CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" \ + LDFLAGS="-lcompat" +%endif -for dir in shlibs/* disk-utils misc-utils fsck fdisk schedutils hwclock; do - %{__make} -C $dir \ - %if %{with uClibc} - LDFLAGS="-Wl,-static" - %endif - %if %{with dietlibc} - CPPFLAGS="$CPPFLAGS -D_BSD_SOURCE" \ - LDFLAGS="-lcompat" - %endif - # empty line required because there is a backslash up there - %{__make} -C $dir install DESTDIR=`pwd`/initrd -done +%{__make} install \ + DESTDIR=$(pwd)/initrd %{__make} clean %endif @@ -682,33 +738,54 @@ done --disable-silent-rules \ --disable-use-tty-group \ --disable-wall \ + --enable-chfn-chsh \ --enable-kill \ + --enable-libblkid \ + --enable-line \ + --enable-login \ --enable-login-chown-vcs \ - --enable-login-utils \ + --enable-newgrp \ --enable-partx \ + --enable-runuser%{!?with_su:=no} \ + --enable-su%{!?with_su:=no} \ + --enable-sulogin \ + --enable-tunelp \ + --enable-utmpdump \ + --enable-vipw \ --enable-write \ --with-audit \ - --with-pam \ - --with%{!?with_selinux:out}-selinux + --with-bashcompletiondir=/etc/bash_completion.d \ + --with-selinux%{!?with_selinux:=no} %{__make} +%{__cc} %{rpmcflags} nologin.c -o nologin + %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,security} \ +install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,sysconfig,init,security} \ $RPM_BUILD_ROOT{/%{_lib},/var/{lock,lib/libuuid}} %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -sed -i -e 's,/usr/spool/mail,/var/mail,g' $RPM_BUILD_ROOT%{_mandir}/man1/login.1 - mv $RPM_BUILD_ROOT%{_sbindir}/{addpart,delpart,partx} $RPM_BUILD_ROOT/sbin +mv $RPM_BUILD_ROOT/sbin/raw $RPM_BUILD_ROOT%{_bindir} -cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login +install nologin $RPM_BUILD_ROOT/sbin +install %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man8 + +cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/login install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/blockdev -cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev +cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/blockdev +cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/init/blockdev.conf +%if %{with su} +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 +cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/pam.d/runuser-l +%endif :> $RPM_BUILD_ROOT/etc/security/blacklist.login :> $RPM_BUILD_ROOT/var/lock/wtmpxlock @@ -721,7 +798,9 @@ for lib in blkid uuid mount; do done ln -sf hwclock $RPM_BUILD_ROOT/sbin/clock -echo '.so hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8 +echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/man8/clock.8 + +ln -s utmpdump $RPM_BUILD_ROOT%{_bindir}/utmpx-dump for d in cs de es fi fr hu id it ja ko nl pl ; do for m in man1 man5 man8 ; do @@ -731,6 +810,20 @@ for d in cs de es fi fr hu id it ja ko nl pl ; do fi done done +# it's been moved from man1 to man8 +for d in es ja ko ; do + mv -f $RPM_BUILD_ROOT%{_mandir}/$d/man1/readprofile.1 \ + $RPM_BUILD_ROOT%{_mandir}/$d/man8/readprofile.8 + %{__sed} -i -e 's/READPROFILE 1/READPROFILE 8/' $RPM_BUILD_ROOT%{_mandir}/$d/man8/readprofile.8 +done +# fix inconsistent man links +echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/es/man8/clock.8 +echo '.so man8/hwclock.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/clock.8 +echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/es/man8/swapoff.8 +echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/it/man8/swapoff.8 +echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/ja/man8/swapoff.8 +echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/ko/man8/swapoff.8 +echo '.so man8/swapon.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/swapoff.8 # cleanup, remove files not included in package %{__rm} $RPM_BUILD_ROOT%{_bindir}/{chfn,chsh,newgrp} \ @@ -741,25 +834,29 @@ done $RPM_BUILD_ROOT%{_mandir}/*/man5/nfs.5 \ $RPM_BUILD_ROOT%{_mandir}/*/man8/{elvtune,setfdprm,sln,ramsize,raw,rdev,rootflags,vidmode}.8 -%ifarch sparc sparc64 +%ifarch sparc sparcv9 sparc64 +# programs not built on sparc %{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/{cfdisk,sfdisk}.8 %endif +# examples +%{__rm} $RPM_BUILD_ROOT%{_datadir}/getopt/getopt-parse.*sh + %if %{with initrd} install -d $RPM_BUILD_ROOT%{_libdir}/initrd -install -p initrd%{_bindir}/* $RPM_BUILD_ROOT%{_libdir}/initrd/ -install -p initrd%{_sbindir}/* $RPM_BUILD_ROOT%{_libdir}/initrd/ +install -p initrd/bin/* $RPM_BUILD_ROOT%{_libdir}/initrd +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/{chkdupexe,ddate,uuidd,mcookie,whereis,mkfs*,fsck.minix,isosize,logger} +%{__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} %if %{with dietlibc} -cp -a initrd%{_libdir}/lib*.a $RPM_BUILD_ROOT%{dietlibdir} +cp -a initrd/%{_lib}/lib*.a $RPM_BUILD_ROOT%{dietlibdir} %endif %endif -%find_lang util-linux +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT @@ -799,14 +896,16 @@ fi %post -n libmount -p /sbin/ldconfig %postun -n libmount -p /sbin/ldconfig -%files -f util-linux.lang +%files -f %{name}.lang %defattr(644,root,root,755) -%doc */README.* text-utils/LICENSE.pg NEWS +%doc AUTHORS ChangeLog NEWS README README.licensing Documentation misc-utils/getopt-parse.{bash,tcsh} %attr(755,root,root) /sbin/clock %attr(755,root,root) /sbin/hwclock* +%attr(755,root,root) /sbin/nologin %{_mandir}/man8/clock.8* %{_mandir}/man8/hwclock.8* +%{_mandir}/man8/nologin.8* %lang(es) %{_mandir}/es/man8/clock.8* %lang(es) %{_mandir}/es/man8/hwclock.8* %lang(ja) %{_mandir}/ja/man8/clock.8* @@ -851,16 +950,22 @@ fi %attr(755,root,root) /bin/dmesg %attr(755,root,root) /bin/kill -%attr(755,root,root) /bin/lsblk %attr(755,root,root) /bin/more -%attr(755,root,root) /sbin/addpart + +%attr(755,root,root) /bin/wdctl + +%attr(755,root,root) /sbin/chcpu %attr(755,root,root) /sbin/ctrlaltdel +%attr(755,root,root) /sbin/addpart +%attr(755,root,root) /sbin/blkdiscard %attr(755,root,root) /sbin/delpart +%attr(755,root,root) /sbin/partx +%attr(755,root,root) /bin/lsblk %attr(755,root,root) /sbin/fsfreeze %attr(755,root,root) /sbin/fstrim %attr(755,root,root) /sbin/mkfs %attr(755,root,root) /sbin/mkswap -%attr(755,root,root) /sbin/partx +%attr(755,root,root) /sbin/sulogin %attr(755,root,root) /sbin/swaplabel %if "%{pld_release}" != "ac" %attr(755,root,root) /sbin/switch_root @@ -873,7 +978,7 @@ fi %attr(755,root,root) %{_bindir}/colrm %attr(755,root,root) %{_bindir}/column %attr(755,root,root) %{_bindir}/cytune -%attr(755,root,root) %{_bindir}/ddate +%attr(755,root,root) %{_bindir}/eject %attr(755,root,root) %{_bindir}/flock %{?with_fallocate:%attr(755,root,root) %{_bindir}/fallocate} %attr(755,root,root) %{_bindir}/getopt @@ -887,25 +992,33 @@ fi %attr(755,root,root) %{_bindir}/logger %attr(755,root,root) %{_bindir}/look %attr(755,root,root) %{_bindir}/lscpu +%attr(755,root,root) %{_bindir}/lslocks %attr(755,root,root) %{_bindir}/mcookie %attr(755,root,root) %{_bindir}/namei +%attr(755,root,root) %{_bindir}/nsenter %attr(755,root,root) %{_bindir}/pg +%attr(755,root,root) %{_bindir}/prlimit +%attr(755,root,root) %{_bindir}/raw %attr(755,root,root) %{_bindir}/rename %attr(755,root,root) %{_bindir}/renice %attr(755,root,root) %{_bindir}/rev %attr(755,root,root) %{_bindir}/script %attr(755,root,root) %{_bindir}/scriptreplay +%attr(755,root,root) %{_bindir}/setpriv %attr(755,root,root) %{_bindir}/setsid %attr(755,root,root) %{_bindir}/setterm %attr(755,root,root) %{_bindir}/tailf %attr(755,root,root) %{_bindir}/taskset %attr(755,root,root) %{_bindir}/ul %attr(755,root,root) %{_bindir}/unshare +%attr(755,root,root) %{_bindir}/utmpdump +%attr(755,root,root) %{_bindir}/utmpx-dump %attr(755,root,root) %{_bindir}/whereis %attr(2755,root,tty) %{_bindir}/write %attr(755,root,root) %{_sbindir}/fdformat %attr(755,root,root) %{_sbindir}/ldattach %attr(755,root,root) %{_sbindir}/readprofile +%attr(755,root,root) %{_sbindir}/resizepart %attr(755,root,root) %{_sbindir}/rtcwake %{_mandir}/man1/cal.1* @@ -914,8 +1027,8 @@ fi %{_mandir}/man1/colcrt.1* %{_mandir}/man1/colrm.1* %{_mandir}/man1/column.1* -%{_mandir}/man1/ddate.1* %{_mandir}/man1/dmesg.1* +%{_mandir}/man1/eject.1* %{?with_fallocate:%{_mandir}/man1/fallocate.1*} %{_mandir}/man1/flock.1* %{_mandir}/man1/getopt.1* @@ -932,11 +1045,13 @@ fi %{_mandir}/man1/mcookie.1* %{_mandir}/man1/more.1* %{_mandir}/man1/namei.1* +%{_mandir}/man1/nsenter.1* +%{_mandir}/man1/prlimit.1* %{_mandir}/man1/pg.1* -%{_mandir}/man1/readprofile.1* %{_mandir}/man1/renice.1* %{_mandir}/man1/rev.1* %{_mandir}/man1/rename.1* +%{_mandir}/man1/setpriv.1* %{_mandir}/man1/setsid.1* %{_mandir}/man1/script.1* %{_mandir}/man1/scriptreplay.1* @@ -945,25 +1060,34 @@ fi %{_mandir}/man1/taskset.1* %{_mandir}/man1/ul.1* %{_mandir}/man1/unshare.1* +%{_mandir}/man1/utmpdump.1* %{_mandir}/man1/whereis.1* %{_mandir}/man1/write.1* %{_mandir}/man8/addpart.8* +%{_mandir}/man8/blkdiscard.8* +%{_mandir}/man8/delpart.8* +%{_mandir}/man8/partx.8* +%{_mandir}/man8/lsblk.8* +%{_mandir}/man8/chcpu.8* %{_mandir}/man8/ctrlaltdel.8* %{_mandir}/man8/cytune.8* -%{_mandir}/man8/delpart.8* %{_mandir}/man8/fdformat.8* %{_mandir}/man8/fsfreeze.8* %{_mandir}/man8/fstrim.8* %{_mandir}/man8/isosize.8* %{_mandir}/man8/ldattach.8* -%{_mandir}/man8/lsblk.8* +%{_mandir}/man8/lslocks.8* %{_mandir}/man8/mkswap.8* -%{_mandir}/man8/partx.8* +%{_mandir}/man8/raw.8* +%{_mandir}/man8/readprofile.8* +%{_mandir}/man8/resizepart.8* %{_mandir}/man8/rtcwake.8* %{_mandir}/man8/swaplabel.8* %if "%{pld_release}" != "ac" %{_mandir}/man8/switch_root.8* %endif +%{_mandir}/man8/sulogin.8* +%{_mandir}/man8/wdctl.8* %{_mandir}/man8/wipefs.8* %lang(de) %{_mandir}/de/man1/kill.1* @@ -973,12 +1097,10 @@ fi %lang(es) %{_mandir}/es/man1/colrm.1* %lang(es) %{_mandir}/es/man1/column.1* -%lang(es) %{_mandir}/es/man1/ddate.1* %lang(es) %{_mandir}/es/man1/getopt.1* %lang(es) %{_mandir}/es/man1/look.1* %lang(es) %{_mandir}/es/man1/more.1* %lang(es) %{_mandir}/es/man1/namei.1* -%lang(es) %{_mandir}/es/man1/readprofile.1* %lang(es) %{_mandir}/es/man1/rev.1* %lang(es) %{_mandir}/es/man1/script.1* %lang(es) %{_mandir}/es/man1/setterm.1* @@ -990,6 +1112,7 @@ fi %lang(es) %{_mandir}/es/man8/ipcrm.8* %lang(es) %{_mandir}/es/man8/ipcs.8* %lang(es) %{_mandir}/es/man8/mkswap.8* +%lang(es) %{_mandir}/es/man8/readprofile.8* %lang(es) %{_mandir}/es/man8/renice.8* %lang(es) %{_mandir}/es/man8/setsid.8* @@ -1043,18 +1166,15 @@ fi %lang(ja) %{_mandir}/ja/man1/colcrt.1* %lang(ja) %{_mandir}/ja/man1/colrm.1* %lang(ja) %{_mandir}/ja/man1/column.1* -%lang(ja) %{_mandir}/ja/man1/ddate.1* %lang(ja) %{_mandir}/ja/man1/getopt.1* %lang(ja) %{_mandir}/ja/man1/hexdump.1* %lang(ja) %{_mandir}/ja/man1/kill.1* %lang(ja) %{_mandir}/ja/man1/line.1* %lang(ja) %{_mandir}/ja/man1/logger.1* -%lang(ja) %{_mandir}/ja/man1/login.1* %lang(ja) %{_mandir}/ja/man1/look.1* %lang(ja) %{_mandir}/ja/man1/mcookie.1* %lang(ja) %{_mandir}/ja/man1/more.1* %lang(ja) %{_mandir}/ja/man1/namei.1* -%lang(ja) %{_mandir}/ja/man1/readprofile.1* %lang(ja) %{_mandir}/ja/man1/rename.1* %lang(ja) %{_mandir}/ja/man1/rev.1* %lang(ja) %{_mandir}/ja/man1/script.1* @@ -1070,6 +1190,7 @@ fi %lang(ja) %{_mandir}/ja/man8/ipcs.8* %lang(ja) %{_mandir}/ja/man8/isosize.8* %lang(ja) %{_mandir}/ja/man8/mkswap.8* +%lang(ja) %{_mandir}/ja/man8/readprofile.8* %lang(ja) %{_mandir}/ja/man8/renice.8* %lang(ja) %{_mandir}/ja/man8/setsid.8* @@ -1078,7 +1199,6 @@ fi %lang(ko) %{_mandir}/ko/man1/colcrt.1* %lang(ko) %{_mandir}/ko/man1/colrm.1* %lang(ko) %{_mandir}/ko/man1/column.1* -%lang(ko) %{_mandir}/ko/man1/ddate.1* %lang(ko) %{_mandir}/ko/man1/getopt.1* %lang(ko) %{_mandir}/ko/man1/hexdump.1* %lang(ko) %{_mandir}/ko/man1/kill.1* @@ -1087,7 +1207,6 @@ fi %lang(ko) %{_mandir}/ko/man1/mcookie.1* %lang(ko) %{_mandir}/ko/man1/more.1* %lang(ko) %{_mandir}/ko/man1/namei.1* -%lang(ko) %{_mandir}/ko/man1/readprofile.1* %lang(ko) %{_mandir}/ko/man1/rev.1* %lang(ko) %{_mandir}/ko/man1/script.1* %lang(ko) %{_mandir}/ko/man1/setterm.1* @@ -1100,6 +1219,7 @@ fi %lang(ko) %{_mandir}/ko/man8/ipcrm.8* %lang(ko) %{_mandir}/ko/man8/ipcs.8* %lang(ko) %{_mandir}/ko/man8/mkswap.8* +%lang(ko) %{_mandir}/ko/man8/readprofile.8* %lang(ko) %{_mandir}/ko/man8/renice.8* %lang(ko) %{_mandir}/ko/man8/setsid.8* @@ -1129,8 +1249,6 @@ fi %lang(pl) %{_mandir}/pl/man8/mkswap.8* %lang(pl) %{_mandir}/pl/man8/renice.8* -%lang(ru) %{_mandir}/ru/man1/ddate.1* - %attr(755,root,root) /sbin/fdisk %attr(755,root,root) /sbin/fsck.minix %attr(755,root,root) /sbin/mkfs.minix @@ -1192,6 +1310,19 @@ fi %attr(755,root,root) /sbin/fsck.cramfs %attr(755,root,root) /sbin/mkfs.cramfs %attr(755,root,root) /sbin/mkfs.bfs +%{_mandir}/man8/fsck.cramfs.8* +%{_mandir}/man8/mkfs.cramfs.8* + +%if %{with su} +%attr(755,root,root) /sbin/runuser +%attr(4755,root,root) /bin/su +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/runuser-l +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/su-l +%{_mandir}/man1/runuser.1* +%{_mandir}/man1/su.1* +%endif %ghost /var/lock/wtmpxlock @@ -1199,20 +1330,22 @@ fi %defattr(644,root,root,755) %attr(754,root,root) /etc/rc.d/init.d/blockdev %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blockdev +%config(noreplace) %verify(not md5 mtime size) /etc/init/blockdev.conf %attr(755,root,root) /sbin/blockdev %{_mandir}/man8/blockdev.8* %lang(ja) %{_mandir}/ja/man8/blockdev.8* %files -n mount %defattr(644,root,root,755) +%attr(755,root,root) /bin/mountpoint %attr(4755,root,root) /bin/mount %attr(4755,root,root) /bin/umount %attr(755,root,root) /sbin/pivot_root %attr(755,root,root) /sbin/swapon %attr(755,root,root) /sbin/swapoff +%{_mandir}/man1/mountpoint.1* %{_mandir}/man5/fstab.5* - %{_mandir}/man8/mount.8* %{_mandir}/man8/umount.8* %{_mandir}/man8/pivot_root.8* @@ -1272,14 +1405,6 @@ fi %lang(ko) %{_mandir}/ko/man8/losetup.8* %lang(pl) %{_mandir}/pl/man8/losetup.8* -%files chkdupexe -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/chkdupexe -%{_mandir}/man1/chkdupexe.1* -%lang(ja) %{_mandir}/ja/man1/chkdupexe.1* -%lang(ko) %{_mandir}/ko/man1/chkdupexe.1* -%lang(pl) %{_mandir}/pl/man1/chkdupexe.1* - %files -n tunelp %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/tunelp @@ -1351,6 +1476,10 @@ fi %defattr(644,root,root,755) %{_libdir}/libuuid.a +%files -n bash-completion-util-linux +%defattr(644,root,root,755) +/etc/bash_completion.d/* + %if %{with initrd} && %{with dietlibc} %files -n libuuid-dietlibc %defattr(644,root,root,755) @@ -1362,6 +1491,8 @@ fi %attr(6755,uuidd,uuidd) %{_sbindir}/uuidd %attr(2775,uuidd,uuidd) /var/lib/libuuid %{_mandir}/man8/uuidd.8* +%{systemdunitdir}/uuidd.service +%{systemdunitdir}/uuidd.socket %files -n libmount %defattr(644,root,root,755) @@ -1382,12 +1513,6 @@ fi %defattr(644,root,root,755) %{_libdir}/libmount.a -%if %{with initrd} && %{with dietlibc} -%files -n libmount-dietlibc -%defattr(644,root,root,755) -%{dietlibdir}/libmount.a -%endif - %files -n fsck %defattr(644,root,root,755) %attr(755,root,root) /sbin/fsck @@ -1396,5 +1521,25 @@ fi %if %{with initrd} %files initrd %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/initrd/* +%attr(755,root,root) %{_libdir}/initrd/blkid +%attr(755,root,root) %{_libdir}/initrd/blockdev +%attr(755,root,root) %{_libdir}/initrd/fdformat +%attr(755,root,root) %{_libdir}/initrd/fdisk +%attr(755,root,root) %{_libdir}/initrd/findfs +%attr(755,root,root) %{_libdir}/initrd/hwclock +%attr(755,root,root) %{_libdir}/initrd/look +%attr(755,root,root) %{_libdir}/initrd/mkswap +%attr(755,root,root) %{_libdir}/initrd/namei +%attr(755,root,root) %{_libdir}/initrd/rename +%ifnarch sparc sparcv9 sparc64 +%attr(755,root,root) %{_libdir}/initrd/sfdisk +%endif +%attr(755,root,root) %{_libdir}/initrd/swaplabel +%attr(755,root,root) %{_libdir}/initrd/uuidgen +%attr(755,root,root) %{_libdir}/initrd/wipefs +# not needed? +#%attr(755,root,root) %{_libdir}/initrd/chrt +# not built because of disabled libmount +#%attr(755,root,root) %{_libdir}/initrd/e2fsck +#%attr(755,root,root) %{_libdir}/initrd/fsck %endif