|
|
@@ -5,7 +5,6 @@
|
|
|
### Features
|
|
|
%define with_selinux 0
|
|
|
%define with_audit 1
|
|
|
-%define mtab_symlink 1
|
|
|
|
|
|
### Macros
|
|
|
%bcond_with bashcomp
|
|
|
@@ -23,7 +22,7 @@ Summary: A collection of basic system utilities
|
|
|
Summary(ja): 基本システムユーティリティー集
|
|
|
Name: util-linux
|
|
|
Version: 2.40.1
|
|
|
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system,admin-tools
|
|
|
Distribution: Vine Linux
|
|
|
Vendor: Project Vine
|
|
|
@@ -134,8 +133,6 @@ Conflicts: e2fsprogs < 1.41.5
|
|
|
# mountpoint is moved from SysVinit-tools
|
|
|
Conflicts: SysVinit-tools < 2.88dsf-2
|
|
|
|
|
|
-Requires(preun): /sbin/install-info
|
|
|
-Requires(post): /sbin/install-info
|
|
|
Requires(pre): coreutils
|
|
|
Requires(post): coreutils
|
|
|
Requires: pam >= 0.66-4, /etc/pam.d/system-auth
|
|
|
@@ -150,6 +147,19 @@ Requires: elogind
|
|
|
Requires: eudev
|
|
|
%endif
|
|
|
|
|
|
+Provides: /bin/dmesg
|
|
|
+Provides: /bin/kill
|
|
|
+Provides: /bin/more
|
|
|
+Provides: /bin/mount
|
|
|
+Provides: /bin/umount
|
|
|
+Provides: /bin/su
|
|
|
+Provides: /sbin/blkid
|
|
|
+Provides: /sbin/blockdev
|
|
|
+Provides: /sbin/fsck
|
|
|
+Provides: /sbin/hwclock
|
|
|
+Provides: /sbin/losetup
|
|
|
+Provides: /sbin/nologin
|
|
|
+
|
|
|
# Vine
|
|
|
Requires(post,preun): alternatives
|
|
|
Provides: pager
|
|
|
@@ -437,20 +447,18 @@ export SUID_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
|
|
|
export DAEMON_CFLAGS="$SUID_CFLAGS"
|
|
|
export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
|
|
%configure \
|
|
|
- --bindir=/bin \
|
|
|
- --sbindir=/sbin \
|
|
|
- --libdir=/%{_lib} \
|
|
|
+ --runstatedir=%{_rundir} \
|
|
|
--disable-silent-rules \
|
|
|
--disable-bfs \
|
|
|
--disable-pg \
|
|
|
--disable-liblastlog2 \
|
|
|
- --enable-partx \
|
|
|
- --enable-login-utils \
|
|
|
- --enable-kill \
|
|
|
+ --enable-chfn-chsh \
|
|
|
--enable-write \
|
|
|
--disable-raw \
|
|
|
+ --enable-hardlink \
|
|
|
+ --enable-partx \
|
|
|
+ --enable-kill \
|
|
|
--enable-ddate \
|
|
|
- --enable-chfn-chsh \
|
|
|
--enable-libmount-force-mountinfo \
|
|
|
--with-udev \
|
|
|
%if %{with_selinux}
|
|
|
@@ -463,14 +471,10 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
|
|
|
%else
|
|
|
--without-audit \
|
|
|
%endif
|
|
|
-%if %{mtab_symlink}
|
|
|
- --enable-libmount-mount \
|
|
|
-%endif
|
|
|
%if %{with systemd}
|
|
|
-with-systemdsystemunitdir=%{_unitdir} \
|
|
|
--with-systemd \
|
|
|
%endif
|
|
|
- --with-fsprobe=builtin \
|
|
|
--with-utempter \
|
|
|
--disable-makeinstall-chown
|
|
|
|
|
|
@@ -479,46 +483,39 @@ make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
%install
|
|
|
-rm -rf ${RPM_BUILD_ROOT}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}/{bin,sbin}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{1,6,8,5}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{pam.d,security/console.apps,blkid}
|
|
|
-mkdir -p ${RPM_BUILD_ROOT}/var/log
|
|
|
-touch ${RPM_BUILD_ROOT}/var/log/lastlog
|
|
|
-chmod 0644 ${RPM_BUILD_ROOT}/var/log/lastlog
|
|
|
+rm -rf %{buildroot}
|
|
|
+mkdir -p %{buildroot}/{bin,sbin}
|
|
|
+mkdir -p %{buildroot}%{_bindir}
|
|
|
+mkdir -p %{buildroot}%{_infodir}
|
|
|
+mkdir -p %{buildroot}%{_mandir}/man{1,6,8,5}
|
|
|
+mkdir -p %{buildroot}%{_sbindir}
|
|
|
+mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps,blkid}
|
|
|
+mkdir -p %{buildroot}/var/log
|
|
|
+touch %{buildroot}/var/log/lastlog
|
|
|
+chmod 0644 %{buildroot}/var/log/lastlog
|
|
|
|
|
|
# install util-linux
|
|
|
-make install DESTDIR=${RPM_BUILD_ROOT}
|
|
|
-
|
|
|
-echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
|
|
|
-{
|
|
|
- # see RH bugzilla #216664
|
|
|
- mkdir -p ${RPM_BUILD_ROOT}/lib/udev/rules.d
|
|
|
- pushd ${RPM_BUILD_ROOT}/lib/udev/rules.d
|
|
|
- install -m 644 %{SOURCE4} ./60-raw.rules
|
|
|
- popd
|
|
|
-}
|
|
|
+make install DESTDIR=%{buildroot}
|
|
|
|
|
|
%if !%{with systemd}
|
|
|
# Our own initscript for uuidd
|
|
|
-install -D -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/rc.d/init.d/uuidd
|
|
|
+install -D -m 755 %{SOURCE10} %{buildroot}/etc/rc.d/init.d/uuidd
|
|
|
%endif
|
|
|
+
|
|
|
# And a dirs uuidd needs that the makefiles don't create
|
|
|
-install -d ${RPM_BUILD_ROOT}/var/run/uuidd
|
|
|
-install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
|
|
|
+install -d %{buildroot}/run/uuidd
|
|
|
+install -d %{buildroot}/var/lib/libuuid
|
|
|
|
|
|
# libtool junk
|
|
|
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
|
|
|
+rm -rf %{buildroot}%{_libdir}/*.la
|
|
|
+rm -f %{buildroot}%{_libdir}/python*/site-packages/*.la
|
|
|
|
|
|
# static libs
|
|
|
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.a
|
|
|
+rm -rf %{buildroot}%{_libdir}/*.a
|
|
|
|
|
|
# PAM settings
|
|
|
{
|
|
|
- pushd ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d
|
|
|
+ pushd %{buildroot}%{_sysconfdir}/pam.d
|
|
|
%if %{with_selinux}
|
|
|
install -m 644 %{SOURCE1} ./login
|
|
|
install -m 644 %{SOURCE2} ./remote
|
|
|
@@ -535,69 +532,13 @@ rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.a
|
|
|
popd
|
|
|
}
|
|
|
|
|
|
-ln -sf ../../sbin/hwclock ${RPM_BUILD_ROOT}/usr/sbin/hwclock
|
|
|
-ln -sf hwclock ${RPM_BUILD_ROOT}/sbin/clock
|
|
|
-
|
|
|
+ln -sf hwclock %{buildroot}%{_sbindir}/clock
|
|
|
+echo ".so man8/hwclock.8" > %{buildroot}%{_mandir}/man8/clock.8
|
|
|
|
|
|
-# Final cleanup
|
|
|
-%ifarch %no_hwclock_archs
|
|
|
-rm -f $RPM_BUILD_ROOT/sbin/{hwclock,clock} $RPM_BUILD_ROOT%{_mandir}/man8/hwclock.8* $RPM_BUILD_ROOT/usr/sbin/{hwclock,clock}
|
|
|
-%endif
|
|
|
-%ifarch s390 s390x
|
|
|
-rm -f $RPM_BUILD_ROOT/usr/{bin,sbin}/{fdformat,tunelp,floppy} $RPM_BUILD_ROOT%{_mandir}/man8/{fdformat,tunelp,floppy}.8*
|
|
|
-%endif
|
|
|
|
|
|
-# deprecated commands
|
|
|
-for I in /sbin/fsck.minix /sbin/mkfs.{bfs,minix} /sbin/sln \
|
|
|
- /usr/bin/chkdupexe %{_bindir}/line %{_bindir}/pg %{_bindir}/newgrp \
|
|
|
- /sbin/shutdown /usr/sbin/vipw /usr/sbin/vigr; do
|
|
|
- rm -f $RPM_BUILD_ROOT$I
|
|
|
-done
|
|
|
-
|
|
|
-# deprecated man pages
|
|
|
-for I in man1/chkdupexe.1 man1/line.1 man1/pg.1 man1/newgrp.1 \
|
|
|
- man8/fsck.minix.8 man8/mkfs.minix.8 man8/mkfs.bfs.8 \
|
|
|
- man8/vipw.8 man8/vigr; do
|
|
|
- rm -rf $RPM_BUILD_ROOT%{_mandir}/${I}*
|
|
|
-done
|
|
|
-
|
|
|
-# deprecated docs
|
|
|
-for I in text-utils/README.pg misc-utils/README.reset; do
|
|
|
- rm -rf $I
|
|
|
-done
|
|
|
-
|
|
|
-# we install getopt/getopt-*.{bash,tcsh} as doc files
|
|
|
-chmod 644 misc-utils/getopt-*.{bash,tcsh}
|
|
|
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt
|
|
|
-
|
|
|
-ln -sf ../../bin/kill $RPM_BUILD_ROOT%{_bindir}/kill
|
|
|
-
|
|
|
-%if %{mtab_symlink}
|
|
|
- ln -s /proc/mounts %{buildroot}/etc/mtab
|
|
|
-%else
|
|
|
- touch %{buildroot}/etc/mtab
|
|
|
-%endif
|
|
|
+ln -sf ../../bin/kill %{buildroot}%{_bindir}/kill
|
|
|
|
|
|
-# /usr/sbin -> /sbin
|
|
|
-for I in addpart delpart partx; do
|
|
|
- if [ -e $RPM_BUILD_ROOT/usr/sbin/$I ]; then
|
|
|
- mv $RPM_BUILD_ROOT/usr/sbin/$I $RPM_BUILD_ROOT/sbin/$I
|
|
|
- fi
|
|
|
-done
|
|
|
-
|
|
|
-# /usr/bin -> /bin
|
|
|
-for I in taskset; do
|
|
|
- if [ -e $RPM_BUILD_ROOT/usr/bin/$I ]; then
|
|
|
- mv $RPM_BUILD_ROOT/usr/bin/$I $RPM_BUILD_ROOT/bin/$I
|
|
|
- fi
|
|
|
-done
|
|
|
-
|
|
|
-# /sbin -> /bin
|
|
|
-for I in raw; do
|
|
|
- if [ -e $RPM_BUILD_ROOT/sbin/$I ]; then
|
|
|
- mv $RPM_BUILD_ROOT/sbin/$I $RPM_BUILD_ROOT/bin/$I
|
|
|
- fi
|
|
|
-done
|
|
|
+ln -s /proc/mounts %{buildroot}/etc/mtab
|
|
|
|
|
|
# omit info/dir file
|
|
|
rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
|
|
@@ -609,11 +550,11 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
|
|
|
mv %{name}.lang %{name}.files
|
|
|
|
|
|
# create list of setarch(8) symlinks
|
|
|
-find $RPM_BUILD_ROOT%{_bindir}/ -regextype posix-egrep -type l \
|
|
|
+find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \
|
|
|
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)$" \
|
|
|
-printf "%{_bindir}/%f\n" >> %{name}.files
|
|
|
|
|
|
-find $RPM_BUILD_ROOT%{_mandir}/man8 -regextype posix-egrep \
|
|
|
+find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \
|
|
|
-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)\.8.*" \
|
|
|
-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
|
|
|
|
|
|
@@ -634,12 +575,16 @@ make check
|
|
|
%endif
|
|
|
|
|
|
|
|
|
-%clean
|
|
|
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
|
|
|
-
|
|
|
+%pre
|
|
|
+if [ ! -L %{_sbindir}/hwclock ]; then
|
|
|
+ rm -f %{_sbindir}/hwclock
|
|
|
+fi
|
|
|
|
|
|
%post
|
|
|
# only for minimal buildroots without /var/log
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_post fstrim.{service,timer}
|
|
|
+%endif
|
|
|
[ -d /var/log ] || /bin/mkdir -p /var/log
|
|
|
/bin/touch /var/log/lastlog
|
|
|
/bin/chown root:root /var/log/lastlog
|
|
|
@@ -659,21 +604,42 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then
|
|
|
fi
|
|
|
fi
|
|
|
%endif
|
|
|
-%if %{mtab_symlink}
|
|
|
+
|
|
|
+if [ -d /bin -a ! -L /bin ]; then
|
|
|
+ for f in dmesg kill more mount umount su taskset; do
|
|
|
+ if [ ! -L /bin/$f ]; then
|
|
|
+ rm -f /bin/$f
|
|
|
+ ln -sf ..%{_bindir}/$f /bin/$f
|
|
|
+ fi
|
|
|
+ done
|
|
|
+fi
|
|
|
+if [ -d /sbin -a ! -L /sbin ]; then
|
|
|
+ for f in addpart agetty blkid blockdev delpart fsck hwclock losetup nologin partx swapon swapoff; do
|
|
|
+ if [ ! -L /sbin/$f ]; then
|
|
|
+ rm -f /sbin/$f
|
|
|
+ ln -sf ..%{_sbindir}/$f /sbin/$f
|
|
|
+ fi
|
|
|
+ done
|
|
|
+fi
|
|
|
+
|
|
|
rm -f /etc/mtab
|
|
|
ln -s /proc/mounts /etc/mtab
|
|
|
-%else
|
|
|
-touch /etc/mtab
|
|
|
-/bin/chown root:root /etc/mtab
|
|
|
-/bin/chmod 0644 /etc/mtab
|
|
|
-%endif
|
|
|
|
|
|
%preun
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_preun fstrim.{service,timer}
|
|
|
+%endif
|
|
|
if [ "$1" = 0 ]; then
|
|
|
%{_syssbindir}/update-alternatives --remove pager %{_sysbindir}/more
|
|
|
fi
|
|
|
exit 0
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
+%postun
|
|
|
+%systemd_postun_with_restart fstrim.timer
|
|
|
+%systemd_postun fstrim.service
|
|
|
+%endif
|
|
|
+
|
|
|
%post -n libblkid
|
|
|
[ -e /etc/blkid.tab ] && mv /etc/blkid.tab /etc/blkid/blkid.tab || :
|
|
|
[ -e /etc/blkid.tab.old ] && mv /etc/blkid.tab.old /etc/blkid/blkid.tab.old || :
|
|
|
@@ -699,7 +665,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun uuidd.service
|
|
|
%else
|
|
|
-if [ "$1" = 0 ]; then
|
|
|
+if [ "$1" = 0 || -e /usr/bin/systemctl ]; then
|
|
|
/sbin/service uuidd stop > /dev/null 2>&1 || :
|
|
|
/sbin/chkconfig --del uuidd
|
|
|
fi
|
|
|
@@ -710,9 +676,26 @@ fi
|
|
|
%systemd_postun_with_restart uuidd.service
|
|
|
%endif
|
|
|
|
|
|
+%triggerpostun -- %{name} < 2.40.1-2
|
|
|
+if [ -d /bin -a ! -L /bin ]; then
|
|
|
+ for f in dmesg kill more mount umount su taskset; do
|
|
|
+ if [ ! -L /bin/$f ]; then
|
|
|
+ rm -f /bin/$f
|
|
|
+ ln -sf ..%{_bindir}/$f /bin/$f
|
|
|
+ fi
|
|
|
+ done
|
|
|
+fi
|
|
|
+if [ -d /sbin -a ! -L /sbin ]; then
|
|
|
+ for f in addpart agetty blkid blockdev delpart fsck hwclock losetup nologin partx swapon swapoff; do
|
|
|
+ if [ ! -L /sbin/$f ]; then
|
|
|
+ rm -f /sbin/$f
|
|
|
+ ln -sf ..%{_sbindir}/$f /sbin/$f
|
|
|
+ fi
|
|
|
+ done
|
|
|
+fi
|
|
|
+
|
|
|
|
|
|
%files -f %{name}.files
|
|
|
-%defattr(-,root,root)
|
|
|
%doc README NEWS AUTHORS
|
|
|
%doc Documentation/deprecated.txt
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
@@ -723,16 +706,15 @@ fi
|
|
|
%config(noreplace) %{_sysconfdir}/pam.d/chsh
|
|
|
%config(noreplace) %{_sysconfdir}/pam.d/login
|
|
|
%config(noreplace) %{_sysconfdir}/pam.d/remote
|
|
|
-%config(noreplace) %{_sysconfdir}/pam.d/su
|
|
|
-%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
|
|
-%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
|
|
-%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
|
|
-%config(noreplace) /lib/udev/rules.d
|
|
|
-
|
|
|
-%attr(4755,root,root) /bin/mount
|
|
|
-%attr(4755,root,root) /bin/umount
|
|
|
-%attr(4755,root,root) /bin/su
|
|
|
-%attr(755,root,root) /bin/login
|
|
|
+%config(noreplace) %{_sysconfdir}/pam.d/su
|
|
|
+%config(noreplace) %{_sysconfdir}/pam.d/su-l
|
|
|
+%config(noreplace) %{_sysconfdir}/pam.d/runuser
|
|
|
+%config(noreplace) %{_sysconfdir}/pam.d/runuser-l
|
|
|
+
|
|
|
+%attr(4755,root,root) %{_bindir}/mount
|
|
|
+%attr(4755,root,root) %{_bindir}/umount
|
|
|
+%attr(4755,root,root) %{_bindir}/su
|
|
|
+%attr(755,root,root) %{_bindir}/login
|
|
|
%attr(4711,root,root) %{_bindir}/chfn
|
|
|
%attr(4711,root,root) %{_bindir}/chsh
|
|
|
%attr(2755,root,tty) %{_bindir}/write
|
|
|
@@ -744,48 +726,50 @@ fi
|
|
|
%{_unitdir}/fstrim.*
|
|
|
%endif
|
|
|
|
|
|
-/bin/dmesg
|
|
|
-/bin/findmnt
|
|
|
-/bin/kill
|
|
|
-/bin/lsblk
|
|
|
-/bin/lsfd
|
|
|
-/bin/more
|
|
|
-/bin/mountpoint
|
|
|
-/bin/pipesz
|
|
|
-/bin/taskset
|
|
|
-/bin/wdctl
|
|
|
-
|
|
|
-/sbin/addpart
|
|
|
-/sbin/agetty
|
|
|
-/sbin/blkdiscard
|
|
|
-/sbin/blkid
|
|
|
-/sbin/blkpr
|
|
|
-/sbin/blkzone
|
|
|
-/sbin/blockdev
|
|
|
-/sbin/chcpu
|
|
|
-/sbin/ctrlaltdel
|
|
|
-/sbin/delpart
|
|
|
-/sbin/fdisk
|
|
|
-/sbin/findfs
|
|
|
-/sbin/fsck
|
|
|
-/sbin/fsck.cramfs
|
|
|
-/sbin/fsfreeze
|
|
|
-/sbin/fstrim
|
|
|
-/sbin/losetup
|
|
|
-/sbin/mkfs
|
|
|
-/sbin/mkfs.cramfs
|
|
|
-/sbin/mkswap
|
|
|
-/sbin/nologin
|
|
|
-/sbin/partx
|
|
|
-/sbin/pivot_root
|
|
|
-/sbin/runuser
|
|
|
-/sbin/sulogin
|
|
|
-/sbin/swaplabel
|
|
|
-/sbin/swapoff
|
|
|
-/sbin/swapon
|
|
|
-/sbin/switch_root
|
|
|
-/sbin/wipefs
|
|
|
-/sbin/zramctl
|
|
|
+%{_bindir}/dmesg
|
|
|
+%{_bindir}/findmnt
|
|
|
+%{_bindir}/kill
|
|
|
+%{_bindir}/lsblk
|
|
|
+%{_bindir}/lsfd
|
|
|
+%{_bindir}/more
|
|
|
+%{_bindir}/mountpoint
|
|
|
+%{_bindir}/pipesz
|
|
|
+%{_bindir}/taskset
|
|
|
+%{_bindir}/wdctl
|
|
|
+
|
|
|
+%{_sbindir}/addpart
|
|
|
+%{_sbindir}/agetty
|
|
|
+%{_sbindir}/blkdiscard
|
|
|
+%{_sbindir}/blkid
|
|
|
+%{_sbindir}/blkpr
|
|
|
+%{_sbindir}/blkzone
|
|
|
+%{_sbindir}/blockdev
|
|
|
+%{_sbindir}/chcpu
|
|
|
+%{_sbindir}/ctrlaltdel
|
|
|
+%{_sbindir}/delpart
|
|
|
+%{_sbindir}/fdisk
|
|
|
+%{_sbindir}/findfs
|
|
|
+%{_sbindir}/fsck
|
|
|
+%{_sbindir}/fsck.cramfs
|
|
|
+%{_sbindir}/fsck.minix
|
|
|
+%{_sbindir}/fsfreeze
|
|
|
+%{_sbindir}/fstrim
|
|
|
+%{_sbindir}/losetup
|
|
|
+%{_sbindir}/mkfs
|
|
|
+%{_sbindir}/mkfs.cramfs
|
|
|
+%{_sbindir}/mkfs.minix
|
|
|
+%{_sbindir}/mkswap
|
|
|
+%{_sbindir}/nologin
|
|
|
+%{_sbindir}/partx
|
|
|
+%{_sbindir}/pivot_root
|
|
|
+%{_sbindir}/runuser
|
|
|
+%{_sbindir}/sulogin
|
|
|
+%{_sbindir}/swaplabel
|
|
|
+%{_sbindir}/swapoff
|
|
|
+%{_sbindir}/swapon
|
|
|
+%{_sbindir}/switch_root
|
|
|
+%{_sbindir}/wipefs
|
|
|
+%{_sbindir}/zramctl
|
|
|
|
|
|
%{_bindir}/cal
|
|
|
%{_bindir}/chrt
|
|
|
@@ -812,7 +796,6 @@ fi
|
|
|
%{_bindir}/ipcs
|
|
|
%{_bindir}/irqtop
|
|
|
%{_bindir}/isosize
|
|
|
-%{_bindir}/kill
|
|
|
%{_bindir}/last
|
|
|
%{_bindir}/lastb
|
|
|
%{_bindir}/logger
|
|
|
@@ -946,12 +929,14 @@ fi
|
|
|
%{_mandir}/man8/ctrlaltdel.8*
|
|
|
%{_mandir}/man8/chcpu.8*
|
|
|
%{_mandir}/man8/chmem.8*
|
|
|
+%{_mandir}/man8/clock.8*
|
|
|
%{_mandir}/man8/delpart.8*
|
|
|
%{_mandir}/man8/fdisk.8*
|
|
|
%{_mandir}/man8/findfs.8*
|
|
|
%{_mandir}/man8/findmnt.8*
|
|
|
%{_mandir}/man8/fsck.8*
|
|
|
%{_mandir}/man8/fsck.cramfs.8*
|
|
|
+%{_mandir}/man8/fsck.minix.8*
|
|
|
%{_mandir}/man8/fsfreeze.8*
|
|
|
%{_mandir}/man8/fstrim.8*
|
|
|
%{_mandir}/man8/isosize.8*
|
|
|
@@ -962,6 +947,7 @@ fi
|
|
|
%{_mandir}/man8/lsns.8*
|
|
|
%{_mandir}/man8/mkfs.8*
|
|
|
%{_mandir}/man8/mkfs.cramfs.8*
|
|
|
+%{_mandir}/man8/mkfs.minix.8*
|
|
|
%{_mandir}/man8/mkswap.8*
|
|
|
%{_mandir}/man8/mount.8*
|
|
|
%{_mandir}/man8/nologin.8*
|
|
|
@@ -980,19 +966,17 @@ fi
|
|
|
%{_mandir}/man8/umount.8*
|
|
|
%{_mandir}/man8/wdctl.8*
|
|
|
%{_mandir}/man8/wipefs.8*
|
|
|
-%{_mandir}/man8/rawdevices.8*
|
|
|
%{_mandir}/man8/zramctl.8*
|
|
|
|
|
|
%ifnarch s390 s390x
|
|
|
-/sbin/clock
|
|
|
-/sbin/hwclock
|
|
|
+%{_sbindir}/clock
|
|
|
%{_sbindir}/hwclock
|
|
|
%{_mandir}/man8/hwclock.8*
|
|
|
%endif
|
|
|
|
|
|
%ifnarch sparc sparcv9 sparc64
|
|
|
-/sbin/cfdisk
|
|
|
-/sbin/sfdisk
|
|
|
+%{_sbindir}/cfdisk
|
|
|
+%{_sbindir}/sfdisk
|
|
|
%{_mandir}/man8/cfdisk.8*
|
|
|
%{_mandir}/man8/sfdisk.8*
|
|
|
%endif
|
|
|
@@ -1003,12 +987,10 @@ fi
|
|
|
|
|
|
%if %{with bashcomp}
|
|
|
%files -n bash-completion-util-linux
|
|
|
-%defattr(-,root,root)
|
|
|
%{compldir}/*
|
|
|
%endif
|
|
|
|
|
|
%files -n uuidd
|
|
|
-%defattr(-,root,root)
|
|
|
%if %{with systemd}
|
|
|
%{_tmpfilesdir}/uuidd-tmpfiles.conf
|
|
|
%{_unitdir}/uuidd.*
|
|
|
@@ -1018,39 +1000,32 @@ fi
|
|
|
%{_mandir}/man8/uuidd.8*
|
|
|
%attr(-, uuidd, uuidd) %{_sbindir}/uuidd
|
|
|
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
|
|
|
-%dir %attr(2775, uuidd, uuidd) /var/run/uuidd
|
|
|
|
|
|
%files -n libfdisk
|
|
|
-%defattr(-,root,root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license Documentation/licenses/COPYING.LGPL-2.1* libfdisk/COPYING*
|
|
|
-/%{_lib}/libfdisk.so.*
|
|
|
+%{_libdir}/libfdisk.so.*
|
|
|
|
|
|
%files -n libfdisk-devel
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/libfdisk.so
|
|
|
%{_includedir}/libfdisk
|
|
|
%{_libdir}/pkgconfig/fdisk.pc
|
|
|
|
|
|
%files -n libsmartcols
|
|
|
-%defattr(-,root,root)
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
%license Documentation/licenses/COPYING.LGPL-2.1* libsmartcols/COPYING*
|
|
|
-/%{_lib}/libsmartcols.so.*
|
|
|
+%{_libdir}/libsmartcols.so.*
|
|
|
|
|
|
%files -n libsmartcols-devel
|
|
|
-%defattr(-,root,root)
|
|
|
%{_libdir}/libsmartcols.so
|
|
|
%{_includedir}/libsmartcols
|
|
|
%{_libdir}/pkgconfig/smartcols.pc
|
|
|
|
|
|
%files -n libmount
|
|
|
-%defattr(-,root,root)
|
|
|
%doc libmount/COPYING
|
|
|
-/%{_lib}/libmount.so.*
|
|
|
+%{_libdir}/libmount.so.*
|
|
|
|
|
|
%files -n libmount-devel
|
|
|
-%defattr(-,root,root)
|
|
|
%doc libmount/COPYING
|
|
|
#%{_libdir}/libmount.a
|
|
|
%{_libdir}/libmount.so
|
|
|
@@ -1058,12 +1033,10 @@ fi
|
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
|
|
|
|
%files -n libblkid
|
|
|
-%defattr(-,root,root)
|
|
|
%dir /etc/blkid
|
|
|
-/%{_lib}/libblkid.so.*
|
|
|
+%{_libdir}/libblkid.so.*
|
|
|
|
|
|
%files -n libblkid-devel
|
|
|
-%defattr(-,root,root)
|
|
|
#%{_libdir}/libblkid.a
|
|
|
%{_libdir}/libblkid.so
|
|
|
%{_includedir}/blkid
|
|
|
@@ -1071,11 +1044,9 @@ fi
|
|
|
%{_libdir}/pkgconfig/blkid.pc
|
|
|
|
|
|
%files -n libuuid
|
|
|
-%defattr(-,root,root)
|
|
|
-/%{_lib}/libuuid.so.*
|
|
|
+%{_libdir}/libuuid.so.*
|
|
|
|
|
|
%files -n libuuid-devel
|
|
|
-%defattr(-,root,root)
|
|
|
#%{_libdir}/libuuid.a
|
|
|
%{_libdir}/libuuid.so
|
|
|
%{_includedir}/uuid
|
|
|
@@ -1096,31 +1067,25 @@ fi
|
|
|
# compat32
|
|
|
%if %{build_compat32}
|
|
|
%files -n compat32-libuuid
|
|
|
-%defattr(-,root,root)
|
|
|
-/%{_lib}/libuuid.so.*
|
|
|
+%{_libdir}/libuuid.so.*
|
|
|
|
|
|
%files -n compat32-libuuid-devel
|
|
|
-%defattr(-,root,root)
|
|
|
#%{_libdir}/libuuid.a
|
|
|
%{_libdir}/libuuid.so
|
|
|
%{_libdir}/pkgconfig/uuid.pc
|
|
|
|
|
|
%files -n compat32-libblkid
|
|
|
-%defattr(-,root,root)
|
|
|
-/%{_lib}/libblkid.so.*
|
|
|
+%{_libdir}/libblkid.so.*
|
|
|
|
|
|
%files -n compat32-libblkid-devel
|
|
|
-%defattr(-,root,root)
|
|
|
#%{_libdir}/libblkid.a
|
|
|
%{_libdir}/libblkid.so
|
|
|
%{_libdir}/pkgconfig/blkid.pc
|
|
|
|
|
|
%files -n compat32-libmount
|
|
|
-%defattr(-,root,root)
|
|
|
-/%{_lib}/libmount.so.*
|
|
|
+%{_libdir}/libmount.so.*
|
|
|
|
|
|
%files -n compat32-libmount-devel
|
|
|
-%defattr(-,root,root)
|
|
|
#%{_libdir}/libmount.a
|
|
|
%{_libdir}/libmount.so
|
|
|
%{_libdir}/pkgconfig/mount.pc
|
|
|
@@ -1128,6 +1093,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Jul 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-2
|
|
|
+- fixed path for uuidd.pid
|
|
|
+- prepared usrmerge.
|
|
|
+
|
|
|
* Thu Jun 13 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-1
|
|
|
- new upstream release.
|
|
|
|
