add provides to coreutils-single to make it a drop-in replacement

This commit is contained in:
Kamil Dudka 2018-05-30 09:37:32 +02:00
parent d01deda0a2
commit a38fffab2a
2 changed files with 17 additions and 19 deletions

9
coreutils-provides.inc Normal file
View File

@ -0,0 +1,9 @@
Provides: bundled(gnulib)
# make it possible to install the latest available Adobe Reader RPM for Linux
Provides: /bin/cat
Provides: /bin/chmod
Provides: /bin/echo
Provides: /bin/ln
Provides: /bin/touch
Provides: /bin/rm

View File

@ -1,12 +1,13 @@
Summary: A set of basic GNU tools commonly used in shell scripts Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 8.29 Version: 8.29
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Base Group: System Environment/Base
Url: https://www.gnu.org/software/coreutils/ Url: https://www.gnu.org/software/coreutils/
Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source50: supported_utils Source50: supported_utils
Source51: coreutils-provides.inc
Source105: coreutils-colorls.sh Source105: coreutils-colorls.sh
Source106: coreutils-colorls.csh Source106: coreutils-colorls.csh
@ -107,18 +108,10 @@ BuildRequires: glibc-langpack-en
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
Requires: ncurses Requires: ncurses
Provides: bundled(gnulib)
Provides: coreutils-full = %{version}-%{release} Provides: coreutils-full = %{version}-%{release}
%include %{SOURCE51}
Obsoletes: %{name} < 8.24-100 Obsoletes: %{name} < 8.24-100
# make it possible to install the latest available Adobe Reader RPM for Linux
Provides: /bin/cat
Provides: /bin/chmod
Provides: /bin/echo
Provides: /bin/ln
Provides: /bin/touch
Provides: /bin/rm
%description %description
These are the GNU core utilities. This package is the combination of These are the GNU core utilities. This package is the combination of
the old GNU fileutils, sh-utils, and textutils packages. the old GNU fileutils, sh-utils, and textutils packages.
@ -127,21 +120,14 @@ the old GNU fileutils, sh-utils, and textutils packages.
Summary: coreutils multicall binary Summary: coreutils multicall binary
Suggests: coreutils-common Suggests: coreutils-common
Provides: coreutils = %{version}-%{release} Provides: coreutils = %{version}-%{release}
Provides: coreutils%{?_isa} = %{version}-%{release}
%include %{SOURCE51}
# To avoid clobbering installs # To avoid clobbering installs
Conflicts: coreutils < 8.24-100 Conflicts: coreutils < 8.24-100
# Note RPM doesn't support separate buildroots for %files # Note RPM doesn't support separate buildroots for %files
# http://rpm.org/ticket/874 so use RemovePathPostfixes # http://rpm.org/ticket/874 so use RemovePathPostfixes
# (new in rpm 4.13) to support separate file sets. # (new in rpm 4.13) to support separate file sets.
RemovePathPostfixes: .single RemovePathPostfixes: .single
# make it possible to install the latest available Adobe Reader RPM for Linux
Provides: /bin/cat
Provides: /bin/chmod
Provides: /bin/echo
Provides: /bin/ln
Provides: /bin/touch
Provides: /bin/rm
%description single %description single
These are the GNU core utilities, These are the GNU core utilities,
packaged as a single multicall binary. packaged as a single multicall binary.
@ -283,6 +269,9 @@ fi
%license COPYING %license COPYING
%changelog %changelog
* Wed May 30 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-12
- add provides to coreutils-single to make it a drop-in replacement
* Mon May 28 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-11 * Mon May 28 2018 Kamil Dudka <kdudka@redhat.com> - 8.29-11
- ls: increase the allowed abmon width from 5 to 12 (#1577872) - ls: increase the allowed abmon width from 5 to 12 (#1577872)
- date, ls: pick strftime fixes from glibc to improve locale support (#1577872) - date, ls: pick strftime fixes from glibc to improve locale support (#1577872)