From e50ad16dc0ba49571562f2f2fcf7731cd4349225 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Sat, 21 Mar 2020 18:03:04 +0800 Subject: [PATCH] obsoletes hardlink --- util-linux.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/util-linux.spec b/util-linux.spec index 8c7b3f0..92a6ab4 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Name: util-linux Version: 2.34 -Release: 5 +Release: 6 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 @@ -29,10 +29,10 @@ Conflicts: initscripts < 9.79-4 bash-completion < 1:2.1-1 coreutils < 8.20 Conflicts: e2fsprogs < 1.41.8-5 filesystem < 3 Provides: eject = 2.1.6 rfkill = 0.5 -Provides: util-linux-ng = %{version}-%{release} +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 -Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 +Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9 Patch0000: 2.28-login-lastlog-create.patch Patch0001: fdisk-fix-quit-dialog-for-non-libreadline-version.patch @@ -134,6 +134,8 @@ development of %{name}. Summary: Help package for ${name} BuildArch: noarch Requires: %{name} = %{version}-%{release} +Obsoletes: hardlink-help <= 1:1.3-9 +Provides: hardlink-help = 1:1.3-9 %description help This package contains some doc and man help files for %{name}. @@ -382,8 +384,13 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog -* Fri Mar 20 2020 openEuler Buildteam - 2.34-5 +* Sat Mar 21 2020 openEuler Buildteam - 2.34-6 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:obsolete hardlink that has been merged into util-linux of 2.34 + +* Fri Mar 20 2020 openEuler Buildteam - 2.34-5 - Type:enhancement - ID:NA - SUG:NA -- Gitee