rpms
/
coreutils
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge conflicts

This commit is contained in:
Ondřej Vašík 2015-11-30 14:33:26 +01:00
parent 49c29b4069 5dc61e9dc1
commit 8e9b3fd0aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coreutils.spec
View File

@ -55,7 +55,7 @@ Patch950: coreutils-selinux.patch
Patch951: coreutils-selinuxmanpages.patch
Conflicts: filesystem < 3
# To avoid clobbering installs during %post
# To avoid clobbering installs
Conflicts: coreutils-single
Provides: /bin/basename
Provides: /bin/cat
@ -132,7 +132,7 @@ the old GNU fileutils, sh-utils, and textutils packages.
Summary: coreutils multicall binary
Suggests: coreutils-common
Provides: coreutils = %{version}-%{release}
# To avoid clobbering installs during %post
# To avoid clobbering installs
Conflicts: coreutils < 8.24-100
# Note RPM doesn't support separate buildroots for %files
# http://rpm.org/ticket/874 so use RemovePathPostfixes