|
@@ -21,7 +21,7 @@
|
|
|
Summary: A collection of basic system utilities
|
|
|
Summary(ja): 基本システムユーティリティー集
|
|
|
Name: util-linux
|
|
|
-Version: 2.40.1
|
|
|
+Version: 2.40.2
|
|
|
Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: system,admin-tools
|
|
|
Distribution: Vine Linux
|
|
@@ -535,9 +535,6 @@ popd
|
|
|
ln -sf hwclock %{buildroot}%{_sbindir}/clock
|
|
|
echo ".so man8/hwclock.8" > %{buildroot}%{_mandir}/man8/clock.8
|
|
|
|
|
|
-
|
|
|
-ln -sf ../../bin/kill %{buildroot}%{_bindir}/kill
|
|
|
-
|
|
|
ln -s /proc/mounts %{buildroot}/etc/mtab
|
|
|
|
|
|
# omit info/dir file
|
|
@@ -576,9 +573,12 @@ make check
|
|
|
|
|
|
|
|
|
%pre
|
|
|
-if [ ! -L %{_sbindir}/hwclock ]; then
|
|
|
+if [ -L %{_sbindir}/hwclock ]; then
|
|
|
rm -f %{_sbindir}/hwclock
|
|
|
fi
|
|
|
+if [ -L %{_bindir}/kill ]; then
|
|
|
+ rm -f %{_bindir}/kill
|
|
|
+fi
|
|
|
|
|
|
%post
|
|
|
# only for minimal buildroots without /var/log
|
|
@@ -665,7 +665,7 @@ fi
|
|
|
%if %{with systemd}
|
|
|
%systemd_preun uuidd.service
|
|
|
%else
|
|
|
-if [ "$1" = 0 || -e /usr/bin/systemctl ]; then
|
|
|
+if [ "$1" = 0 -o -e /usr/bin/systemctl ]; then
|
|
|
/sbin/service uuidd stop > /dev/null 2>&1 || :
|
|
|
/sbin/chkconfig --del uuidd
|
|
|
fi
|
|
@@ -1093,6 +1093,13 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.2-2
|
|
|
+- rebuilt to drop wrong package.
|
|
|
+
|
|
|
+* Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.2-1
|
|
|
+- new upstream release.
|
|
|
+- made to remove a symlink at /usr/bin/kill in %%pre.
|
|
|
+
|
|
|
* Tue Jul 02 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.40.1-2
|
|
|
- fixed path for uuidd.pid
|
|
|
- prepared usrmerge.
|