diff --git a/util-linux.spec b/util-linux.spec index d9b8bde..975192d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -3,7 +3,7 @@ Name: util-linux Version: 2.37.2 -Release: 4 +Release: 5 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 @@ -40,15 +40,14 @@ Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth audit-libs >= 1.0.6 Requires: libblkid = %{version}-%{release} libmount = %{version}-%{release} libsmartcols = %{version}-%{release} Requires: libfdisk = %{version}-%{release} libuuid = %{version}-%{release} -Conflicts: initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 +Conflicts: initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 sysvinit-tools < 2.88-14 Conflicts: e2fsprogs < 1.41.8-5 filesystem < 3 Provides: eject = 2.1.6 rfkill = 0.5 Provides: util-linux-ng = %{version}-%{release} hardlink = 1:1.3-9 Provides: /bin/dmesg /bin/kill /bin/more /bin/mount /bin/umount /sbin/blkid Provides: /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin -Provides: /bin/last /bin/lastb /bin/mesg /bin/wall -Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9 sysvinit-tools < 0:2.89 +Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9 %description The util-linux package contains a random collection of files that @@ -306,7 +305,7 @@ fi %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %{_unitdir}/fstrim.* %{_bindir}/{cal,chrt,col,colcrt,colrm,column,chmem,dmesg,eject,fallocate,fincore,findmnt,choom,uclampset} -%{_bindir}/{flock,getopt,ionice,ipcmk,ipcrm,ipcs,isosize,kill,last,lastb,logger,hardlink} +%{_bindir}/{flock,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,kill,last,lastb,logger,hardlink} %{_bindir}/{look,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns,mcookie,mesg,more,mountpoint} %{_bindir}/{namei,nsenter,prlimit,raw,rename,renice,rev,script,scriptreplay,setarch,setpriv} %{_bindir}/{setsid,setterm,taskset,ul,unshare,utmpdump,uuidgen,uuidparse,wdctl,whereis,scriptlive,irqtop,lsirq} @@ -318,7 +317,7 @@ fi %{compldir}/{addpart,blkdiscard,blkid,blkzone,blockdev,cal,chcpu,chmem,chrt,col} %{compldir}/{colcrt,colrm,column,ctrlaltdel,delpart,dmesg,eject,fallocate,fdisk} %{compldir}/{fincore,findfs,findmnt,flock,fsck,fsck.cramfs,fsck.minix,fsfreeze} -%{compldir}/{fstrim,getopt,ionice,ipcmk,ipcrm,ipcs,isosize,last,ldattach} +%{compldir}/{fstrim,getopt,hexdump,ionice,ipcmk,ipcrm,ipcs,isosize,last,ldattach} %{compldir}/{logger,look,losetup,lsblk,lscpu,lsipc,lslocks,lslogins,lsmem,lsns} %{compldir}/{mcookie,mesg,mkfs,mkfs.cramfs,mkfs.minix,mkswap,more,mountpoint} %{compldir}/{namei,nsenter,partx,pivot_root,prlimit,raw,readprofile,rename,renice} @@ -372,8 +371,6 @@ fi %{_includedir}/{libfdisk,libsmartcols,uuid,blkid,libmount} %{_libdir}/{libfdisk.so,libsmartcols.so,libuuid.so,libblkid.so,libmount.so} %{_libdir}/pkgconfig/{fdisk.pc,smartcols.pc,uuid.pc,blkid.pc,mount.pc} -%{_bindir}/hexdump -%{compldir}/hexdump %files help %exclude %{_datadir}/doc/util-linux/getopt/* @@ -398,6 +395,13 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Wed Jun 29 2022 shangyibin - 2.37.2-5 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fallback to move hexdump from util-linux to util-linux-devel + Fallback solve yum failure because of files conflicts + * Mon Jun 20 2022 shangyibin - 2.37.2-4 - Type:bugfix - ID:NA