Browse Source

updated 2 packages

ncurses-6.5-5

util-linux-2.40.2-2
Tomohiro "Tomo-p" KATO 8 tháng trước cách đây
mục cha
commit
d0826b6930
2 tập tin đã thay đổi với 18 bổ sung8 xóa
  1. 5 2
      n/ncurses/ncurses-vl.spec
  2. 13 6
      u/util-linux/util-linux-vl.spec

+ 5 - 2
n/ncurses/ncurses-vl.spec

@@ -7,7 +7,7 @@ Summary: A screen handling and optimization package.
 Summary(ja): スクリーンの操作と最適化を行うパッケージ
 Name: ncurses
 Version: 6.5
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -244,7 +244,7 @@ rm -f %{buildroot}%{_libdir}/terminfo
 #rm -f %{buildroot}%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc
 
 
-%pre
+%triggerpostun -- %{name} < 6.5-4
 r=$(realpath -e /%{_lib}/libncurses.so.5 2>/dev/null)
 if [ -d /bin -a ! -L /bin ] && [[ "${r}" == "%{_libdir}/"* ]]; then
 	for lib in ncurses ncursesw tinfo; do
@@ -321,6 +321,9 @@ exit 0
 
 
 %changelog
+* Fri Jul 05 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.5-5
+- moved scripts from %%pre to %%triggerpostun.
+
 * Thu Jul 04 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.5-4
 - fixed %%pre.
 

+ 13 - 6
u/util-linux/util-linux-vl.spec

@@ -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.