diff --git a/util-linux.spec b/util-linux.spec index 9f785e6b5f2f428d8b5597725b70896f3908ea7b..8e6783f7bad5a1990e2a9d2522c70a3999abcfeb 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 12 +Release: 13 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 @@ -48,7 +48,7 @@ Patch9003: add-new-gmo-file.patch BuildRequires: audit-libs-devel >= 1.0.6 gettext-devel libselinux-devel ncurses-devel pam-devel zlib-devel popt-devel BuildRequires: libutempter-devel systemd-devel systemd libuser-devel libcap-ng-devel python3-devel gcc -BuildRequires: make readline-devel rubygem-asciidoctor po4a lsof git +BuildRequires: make readline-devel po4a lsof git #enable if make changes to build-system BuildRequires: autoconf automake libtool bison @@ -237,9 +237,6 @@ find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ -regex ".*(linux32|linux64|aarch64|i386|x86_64|ppc64le|uname26)\.8.*" \ -printf "%{_mandir}/man8/%f*\n" > %{name}-help.files -%find_lang %name --all-name --with-man --without-mo -cat %{name}.lang >> %{name}-help.files - rm -rf %{buildroot}%{_libdir}/*.{la,a} rm -rf %{buildroot}%{_libdir}/python*/site-packages/*.{la,a} @@ -398,13 +395,7 @@ fi %{_libdir}/{libfdisk.so,libsmartcols.so,libuuid.so,libblkid.so,libmount.so} %{_libdir}/pkgconfig/{fdisk.pc,smartcols.pc,uuid.pc,blkid.pc,mount.pc} -%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/* +%files help %{_docdir}/%{name}/getopt-example.* %doc README NEWS Documentation/deprecated.txt %doc %attr(0644,-,-) misc-utils/getopt-*.{bash,tcsh} @@ -412,11 +403,11 @@ fi %{_mandir}/man1/{fallocate.1*,fincore.1*,flock.1*,getopt.1*,hexdump.1*,ionice.1*,ipcmk.1*,ipcrm.1*,ipcs.1*} %{_mandir}/man1/{kill.1*,last.1*,lastb.1*,logger.1*,login.1*,look.1*,lscpu.1*,lsipc.1*,lslogins.1*,lsmem.1*} %{_mandir}/man1/{mcookie.1*,mesg.1*,more.1*,mountpoint.1*,namei.1*,nsenter.1*,prlimit.1*,rename.1*,renice.1*} -%{_mandir}/man1/{rev.1*,runuser.1*,script.1*,scriptreplay.1*,setpriv.1*,setsid.1*,setterm.1*,su.1*,taskset.1*,pipesz.1.*,lsfd.1*,fadvise.1.*} +%{_mandir}/man1/{rev.1*,runuser.1*,script.1*,scriptreplay.1*,setpriv.1*,setsid.1*,setterm.1*,su.1*,taskset.1*,pipesz.1.*,lsfd.1*,fadvise.1.*,waitpid.1.*} %{_mandir}/man1/{ul.1*,unshare.1*,utmpdump.1.gz,uuidgen.1*,uuidparse.1*,wall.1*,whereis.1*,write.1*,choom.1*,scriptlive*,hardlink.1*,irqtop.1*,lsirq.1*} %{_mandir}/man3/{libblkid.3*,uuid.3*,uuid_clear.3*,uuid_compare.3*,uuid_copy.3*,uuid_generate.3*,uuid_generate_random.3*} %{_mandir}/man3/{uuid_generate_time_safe.3*,uuid_is_null.3*,uuid_parse.3*,uuid_time.3*,uuid_unparse.3*,uuid_generate_time.3*} -%{_mandir}/man5/{fstab.5*,terminal-colors.d.5*,adjtime_config.5.*,waitpid.1.*} +%{_mandir}/man5/{fstab.5*,terminal-colors.d.5*,adjtime_config.5.*} %{_mandir}/man8/{uuidd.8*,fdformat.8*,hwclock.8*,clock.8*,cfdisk.8*,sfdisk.8*,addpart.8*,agetty.8*} %{_mandir}/man8/{blkdiscard.8*,blkid.8*,blkzone.8*,blockdev.8*,chcpu.8*,chmem.8*,ctrlaltdel.8*,delpart.8*} %{_mandir}/man8/{fdisk.8*,findfs.8*,findmnt.8*,fsck.8*,fsck.cramfs.8*,fsck.minix.8*,fsfreeze.8*,fstrim.8*,blkpr.8.*} @@ -429,6 +420,12 @@ fi %endif %changelog +* Mon Sep 9 2024 zhangyao - 2.39.1-13 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:reslove install conflicts with procps-ng-i18n together + * Mon Aug 5 2024 - 2.39.1-12 - Fixed incorrect macro usage in summary fields of devel and help subpackages