Related: #1306559 - drop workaround for already fixed rpm-build bug

This commit is contained in:
Kamil Dudka 2017-05-03 13:40:56 +02:00
parent 28873d6a70
commit 34aa759415
2 changed files with 6 additions and 31 deletions

View File

@ -1,25 +0,0 @@
#!/bin/sh -
# Reduce requires for coreutils-single
# Needed since it has overlapping "binaries" with the main package
# Ideally we could do the following in the spec only for the single subpackage
# %define __requires_exclude_from ^(%{_bindir}|%{_sbindir})/([^c]|c[^o]|co[^r]|cor[^e])
original_find_requires="$1"
shift
# Get the list of files.
files=`sed "s/['\"]/\\\&/g"`
single_bin='/usr/bin/coreutils'
single=`echo $files | grep "$single_bin"`
echo $files | tr [:blank:] '\n' |
if [ "$single" ]; then
# Only allow the coreutils multicall binary
# Also adjust for .single renaming
sed -n 's|\(.*'"$single_bin"'\)\(.single\)\?$|\1.single|p'
else
cat
fi |
$original_find_requires

View File

@ -1,7 +1,7 @@
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.27 Version: 8.27
Release: 6%{?dist} Release: 7%{?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/
@ -10,11 +10,8 @@ Source50: supported_utils
Source105: coreutils-colorls.sh Source105: coreutils-colorls.sh
Source106: coreutils-colorls.csh Source106: coreutils-colorls.csh
# Provide our own custom requires for coreutils-single package # do not make coreutils-single depend on /usr/bin/coreutils
Source10: coreutils-find-requires.sh %global __requires_exclude ^%{_bindir}/coreutils$
%global _use_internal_dependency_generator 0
%global __find_provides %{_rpmconfigdir}/find-provides
%global __find_requires %{SOURCE10} %{_rpmconfigdir}/find-requires
# upstream patches # upstream patches
Patch1: coreutils-8.27-date-debug-test.patch Patch1: coreutils-8.27-date-debug-test.patch
@ -290,6 +287,9 @@ fi
%license COPYING %license COPYING
%changelog %changelog
* Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-7
- drop workaround for already fixed rpm-build bug (#1306559)
* Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-6 * Wed May 03 2017 Kamil Dudka <kdudka@redhat.com> - 8.27-6
- do not mention a deprecated option in localized man pages - do not mention a deprecated option in localized man pages
- drop workaround no longer needed for 10 years old rpm-build bug (#246729) - drop workaround no longer needed for 10 years old rpm-build bug (#246729)