Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/diffutils.git#26b96e31084794e8e3b555406b48db9d8446e4c6
This commit is contained in:
DistroBaker 2021-02-03 12:59:14 +01:00
parent 1e28b8629f
commit 0c935dda02

View File

@ -1,17 +1,18 @@
Summary: A GNU collection of diff utilities Summary: GNU collection of diff utilities
Name: diffutils Name: diffutils
Version: 3.7 Version: 3.7
Release: 7.1%{?dist} Release: 8%{?dist}
URL: http://www.gnu.org/software/diffutils/diffutils.html URL: https://www.gnu.org/software/diffutils/diffutils.html
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
Patch1: diffutils-cmp-s-empty.patch Patch1: diffutils-cmp-s-empty.patch
Patch2: diffutils-i18n.patch Patch2: diffutils-i18n.patch
Patch3: diffutils-fix-gnulib-tests.patch Patch3: diffutils-fix-gnulib-tests.patch
License: GPLv3+ License: GPLv3+
Provides: bundled(gnulib) Provides: bundled(gnulib)
BuildRequires: gcc BuildRequires: gcc
BuildRequires: help2man BuildRequires: help2man
BuildRequires: autoconf, automake, texinfo BuildRequires: autoconf, automake, texinfo
BuildRequires: make
%description %description
Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
@ -62,8 +63,8 @@ make check
%{_infodir}/diffutils.info* %{_infodir}/diffutils.info*
%changelog %changelog
* Sun Dec 20 2020 Petr Šabata <contyk@redhat.com> - 3.7-7.1 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.7-8
- Bump for gcc11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Oct 8 2020 Tim Waugh <twaugh@redhat.com> - 3.7-7 * Thu Oct 8 2020 Tim Waugh <twaugh@redhat.com> - 3.7-7
- Fix from gnulib upstream, commit 175e0bc (bug #1863423). - Fix from gnulib upstream, commit 175e0bc (bug #1863423).