diff --git a/util-linux.spec b/util-linux.spec index 9ca8886..f318548 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 2 +Release: 3 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -378,6 +378,10 @@ fi %files help -f %{name}-help.files %exclude %{_mandir}/man1/* +# newgrp vigr vipw conflicts with shadow-help +%exclude %{_mandir}/*/man1/newgrp.1.gz +%exclude %{_mandir}/*/man8/vigr.8.gz +%exclude %{_mandir}/*/man8/vipw.8.gz %exclude %{_datadir}/doc/util-linux/getopt/* %{_docdir}/%{name}/getopt-example.* %doc README NEWS Documentation/deprecated.txt @@ -400,6 +404,12 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Tue Aug 29 2023 zhangyao - 2.39.1-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix file conflicts with shadow + * Mon Jul 31 2023 zhangyao - 2.39.1-2 - Type:bugfix - CVE:NA