From 12b64ba5dbb88cc466ecb70c9658277ac4afd893 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 22 Jul 2025 13:23:38 +0800 Subject: [PATCH] Fix conflicts with shadow --- util-linux.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/util-linux.spec b/util-linux.spec index 19edc66..37887b1 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,7 +1,9 @@ +%define anolis_release 4 + Summary: Collection of basic system utilities Name: util-linux Version: 2.39.1 -Release: 3%{?dist} +Release: %{anolis_release}%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://en.wikipedia.org/wiki/Util-linux @@ -382,6 +384,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a # temporary remove to avoid conflicts with bash-completion pkg rm -f $RPM_BUILD_ROOT%{compldir}/{mount,umount} +# remove unvanted translations (conflicts with shadow) +rm -f $RPM_BUILD_ROOT%{_mandir}/*/man1/newgrp.* +rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/vigr.* +rm -f $RPM_BUILD_ROOT%{_mandir}/*/man8/vipw.* + # find MO files %find_lang %{name} --all-name --with-man @@ -879,6 +886,9 @@ fi %changelog +* Tue Jul 22 2025 mgb01105731 - 2.39.1-4 +- Fix conflicts with shadow + * Thu Jun 26 2025 Kaiqiang Wang - 2.39.1-3 - add Pytium FTC862 FTC310 FTC664 support -- Gitee