fix a regression, cmp-s returns 1 even if files are identical

This commit is contained in:
Than Ngo 2024-07-24 11:59:20 +02:00
commit 112f3556e3
2 changed files with 26 additions and 5 deletions

View file

@ -1,11 +1,13 @@
Summary: GNU collection of diff utilities
Name: diffutils
Version: 3.10
Release: 6%{?dist}
Release: 7%{?dist}
URL: https://www.gnu.org/software/diffutils/diffutils.html
Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
# Multibyte
Patch0: diffutils-i18n.patch
Patch1: 0001-diff-Fix-output-of-diff-l-y-for-non-ASCII-input-file.patch
Patch2: diffutils-3.10-cmp-s-empty.patch
License: GPL-3.0-or-later
Provides: bundled(gnulib)
BuildRequires: gcc
@ -27,10 +29,7 @@ to merge two files interactively.
Install diffutils if you need to compare text files.
%prep
%setup -q
# Multibyte
%patch -P0 -p1 -b .i18n
%patch -P1 -p1 -b .fix-output-of-diff-l-y-for-non-ASCII-input-file
%autosetup -p1
# Run autoreconf for aarch64 support (bug #925256).
autoreconf
@ -58,6 +57,9 @@ make check
%{_infodir}/diffutils.info*
%changelog
* Tue Jul 23 2024 Than Ngo <than@redhat.com> - 3.10-7
- fix a regression, cmp-s returns 1 even if files are identical
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild