8afaef
Summary: A GNU collection of diff utilities
8afaef
Name: diffutils
8afaef
Version: 3.6
5004ac
Release: 6%{?dist}
8afaef
Group: Applications/Text
8afaef
URL: http://www.gnu.org/software/diffutils/diffutils.html
8afaef
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
8afaef
Patch1: diffutils-cmp-s-empty.patch
8afaef
Patch2: diffutils-i18n.patch
8afaef
Patch3: diffutils-3.6-covscan.patch
5004ac
Patch4: diffutils-3.6-shows_incorrect_data.patch
8afaef
License: GPLv3+
8afaef
Requires(post): info
8afaef
Requires(preun): info
8afaef
Provides: bundled(gnulib)
8afaef
BuildRequires: help2man
8afaef
BuildRequires: autoconf, automake, texinfo
8afaef
8afaef
%description
8afaef
Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
8afaef
compares two files and shows the differences, line by line.  The cmp
8afaef
command shows the offset and line numbers where two files differ, or
8afaef
cmp can show the characters that differ between the two files.  The
8afaef
diff3 command shows the differences between three files.  Diff3 can be
8afaef
used when two people have made independent changes to a common
8afaef
original; diff3 can produce a merged file that contains both sets of
8afaef
changes and warnings about conflicts.  The sdiff command can be used
8afaef
to merge two files interactively.
8afaef
8afaef
Install diffutils if you need to compare text files.
8afaef
8afaef
%prep
8afaef
%setup -q
8afaef
# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
8afaef
%patch1 -p1 -b .cmp-s-empty
8afaef
8afaef
%patch2 -p1 -b .i18n
5004ac
8afaef
# covscan issues
8afaef
%patch3 -p1 -b .covscan
8afaef
5004ac
# bz#1732960, cmp -b shows incorrect data
5004ac
%patch4 -p1 -b .shows_incorrect_data
5004ac
8afaef
# Run autoreconf for aarch64 support (bug #925256).
8afaef
autoreconf
8afaef
8afaef
%build
8afaef
export CFLAGS="$RPM_OPT_FLAGS -Dlint"
8afaef
%configure
8afaef
make PR_PROGRAM=%{_bindir}/pr
8afaef
8afaef
%install
8afaef
rm -rf $RPM_BUILD_ROOT
8afaef
make DESTDIR=$RPM_BUILD_ROOT install
8afaef
8afaef
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
8afaef
%find_lang %{name}
8afaef
8afaef
%check
8afaef
# Disable update-copyright gnulib test (bug #1239428).
8afaef
>gnulib-tests/test-update-copyright.sh
8afaef
make check
8afaef
8afaef
%post
8afaef
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
8afaef
8afaef
%preun
8afaef
if [ $1 = 0 ]; then
8afaef
  /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
8afaef
fi
8afaef
8afaef
%clean
8afaef
rm -rf $RPM_BUILD_ROOT
8afaef
8afaef
%files -f %{name}.lang
8afaef
%defattr(-,root,root)
8afaef
%doc NEWS README
8afaef
%{!?_licensedir:%global license %%doc}
8afaef
%license COPYING
8afaef
%{_bindir}/*
8afaef
%{_mandir}/*/*
8afaef
%{_infodir}/diffutils.info*gz
8afaef
8afaef
%changelog
5004ac
* Tue Nov 19 2019 Than Ngo <than@redhat.com> - 3.6-6
5004ac
- Resolves: #1732960 - cmp -b shows incorrect data
5004ac
8afaef
* Mon Aug 13 2018 Than Ngo <than@redhat.com> - 3.6-5
8afaef
- Resolves: #1606949, covscan issues
8afaef
8afaef
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
8afaef
8afaef
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
8afaef
8afaef
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-2
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
8afaef
8afaef
* Mon May 22 2017 Tim Waugh <twaugh@redhat.com> - 3.6-1
8afaef
- 3.6 (bug #1453019).
8afaef
8afaef
* Tue Feb 21 2017 Than Ngo <than@redhat.com> - 3.5-3
8afaef
- backport to fix  FTBFs with GCC 7
8afaef
8afaef
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-2
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
8afaef
8afaef
* Wed Sep 21 2016 Tim Waugh <twaugh@redhat.com> - 3.5-1
8afaef
- 3.5 (bug #1365325).
8afaef
8afaef
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3-13
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
8afaef
8afaef
* Mon Jul  6 2015 Tim Waugh <twaugh@redhat.com> - 3.3-12
8afaef
- Disable update-copyright gnulib test (bug #1239428).
8afaef
8afaef
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-11
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
8afaef
8afaef
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 3.3-10
8afaef
- Rebuilt for Fedora 23 Change
8afaef
  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
8afaef
8afaef
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-9
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
8afaef
8afaef
* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 3.3-8
8afaef
- fix license handling
8afaef
8afaef
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-7
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
8afaef
8afaef
* Thu Mar 27 2014 Tim Waugh <twaugh@redhat.com> 3.3-6
8afaef
- Fix --help output and man page (bug #1079076).
8afaef
8afaef
* Wed Dec  4 2013 Tim Waugh <twaugh@redhat.com> 3.3-5
8afaef
- Applied upstream gnulib patch to avoid -Wformat-security warning
8afaef
  (bug #1037038).
8afaef
8afaef
* Wed Oct 23 2013 Tim Waugh <twaugh@redhat.com> 3.3-4
8afaef
- Fixed multibyte handling logic for diff -Z (bug #1012075).
8afaef
8afaef
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-3
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
8afaef
8afaef
* Mon Apr 29 2013 Tim Waugh <twaugh@redhat.com> 3.3-2
8afaef
- Run autoreconf for aarch64 support (bug #925256).
8afaef
8afaef
* Tue Mar 26 2013 Tim Waugh <twaugh@redhat.com> 3.3-1
8afaef
- 3.3 (bug #927560).
8afaef
8afaef
* Fri Feb 22 2013 Tim Waugh <twaugh@redhat.com> 3.2-13
8afaef
- Fixed i18n handling of 'diff -E' (bug #914666).
8afaef
8afaef
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-12
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
8afaef
8afaef
* Fri Oct 26 2012 Tim Waugh <twaugh@redhat.com> 3.2-11
8afaef
- Ported i18n patch and reinstated it (bug #870460).
8afaef
8afaef
* Wed Sep 19 2012 Tim Waugh <twaugh@redhat.com> 3.2-10
8afaef
- Fixed license as current source says GPLv3+.
8afaef
8afaef
* Mon Jul 23 2012 Tim Waugh <twaugh@redhat.com> 3.2-9
8afaef
- Fixed build failure.
8afaef
8afaef
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-8
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
8afaef
8afaef
* Mon May 21  2012 Tim Waugh <twaugh@redhat.com> 3.2-7
8afaef
- Provides bundled(gnulib) (bug #821751).
8afaef
8afaef
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-6
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
8afaef
8afaef
* Thu Dec  8 2011 Tim Waugh <twaugh@redhat.com> 3.2-5
8afaef
- Fix bug #747969 again.
8afaef
8afaef
* Tue Nov 29 2011 Tim Waugh <twaugh@redhat.com> 3.2-4
8afaef
- Real fix for bug #747969: the diffutils info file changed name in
8afaef
  3.1.  Updated the scriptlets to install/remove the correct filename
8afaef
  from the info directory.
8afaef
8afaef
* Fri Nov 25 2011 Tim Waugh <twaugh@redhat.com> 3.2-3
8afaef
- Fixed up reference to info page in man pages (bug #747969).
8afaef
8afaef
* Fri Nov 25 2011 Tim Waugh <twaugh@redhat.com> 3.2-2
8afaef
- Applied upstream gnulib fix for float test on ppc, as well as
8afaef
  correction for LDBL_MANT_DIG definition (bug #733536).
8afaef
8afaef
* Fri Sep  2 2011 Tim Waugh <twaugh@redhat.com> 3.2-1
8afaef
- 3.2.
8afaef
8afaef
* Thu Aug 11 2011 Tim Waugh <twaugh@redhat.com> 3.1-1
8afaef
- 3.1.
8afaef
8afaef
* Wed Apr 13 2011 Tim Waugh <twaugh@redhat.com> 3.0-1
8afaef
- 3.0 (bug #566482).
8afaef
- The i18n patch is dropped for the time being.
8afaef
8afaef
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-30
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
8afaef
8afaef
* Fri Jun 25 2010 Tim Waugh <twaugh@redhat.com> 2.8.1-29
8afaef
- For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
8afaef
8afaef
* Wed Apr 21 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-28
8afaef
- Build requires help2man (bug #577325).  Fixes empty diff man page.
8afaef
8afaef
* Wed Mar  3 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-27
8afaef
- Added comments for all patches.
8afaef
8afaef
* Wed Mar  3 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-26
8afaef
- Use upstream man pages.
8afaef
- Ship COPYING file.
8afaef
8afaef
* Tue Aug 11 2009 Tim Waugh <twaugh@redhat.com> 2.8.1-25
8afaef
- Only try to install the info file if it exists so that package
8afaef
  installation does not fail with --excludedocs (bug #515919).
8afaef
8afaef
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-24
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
8afaef
8afaef
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-23
8afaef
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
8afaef
8afaef
* Fri Feb 13 2009 Tim Waugh <twaugh@redhat.com> 2.8.1-22
8afaef
- Fixed 'sdiff -E' (bug #484892).
8afaef
8afaef
* Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 2.8.1-21
8afaef
- Rebuild for GCC 4.3.
8afaef
8afaef
* Wed Jan  2 2008 Tim Waugh <twaugh@redhat.com> 2.8.1-20
8afaef
- Converted spec file to UTF-8 (bug #225696).
8afaef
- Fixed summary (bug #225696).
8afaef
- Fixed PreReq (bug #225696).
8afaef
- Removed Prefix (bug #225696).
8afaef
- Fixed build root (bug #225696).
8afaef
- Avoid %%makeinstall (bug #225696).
8afaef
- Fixed license tag (bug #225696).
8afaef
8afaef
* Tue Nov  6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-19
8afaef
- Rebuilt.
8afaef
8afaef
* Tue Nov  6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-18
8afaef
- Fixed multibyte speed improvement patch (bug #363831).
8afaef
8afaef
* Tue Aug 14 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-17
8afaef
- Multibyte speed improvement (bug #252117).
8afaef
8afaef
* Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-16
8afaef
- Make scriptlet unconditionally succeed (bug #223683).
8afaef
8afaef
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2.2
8afaef
- rebuild
8afaef
8afaef
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2.1
8afaef
- bump again for double-long bug on ppc(64)
8afaef
8afaef
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2
8afaef
- rebuilt for new gcc4.1 snapshot and glibc changes
8afaef
8afaef
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
8afaef
- rebuilt
8afaef
8afaef
* Wed Apr  6 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-15
8afaef
- Fixed sdiff exit code handling (bug #152967).
8afaef
8afaef
* Wed Mar  2 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-14
8afaef
- Rebuild for new GCC.
8afaef
8afaef
* Wed Feb  9 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-13
8afaef
- Rebuilt.
8afaef
8afaef
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
8afaef
- rebuilt
8afaef
8afaef
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
8afaef
- rebuilt
8afaef
8afaef
* Thu Jan  8 2004 Tim Waugh <twaugh@redhat.com> 2.8.1-10
8afaef
- Fix mistaken use of '|' instead of '||'.
8afaef
8afaef
* Sat Oct 25 2003 Tim Waugh <twaugh@redhat.com> 2.8.1-9
8afaef
- Rebuilt.
8afaef
8afaef
* Tue Jun 17 2003 Tim Waugh <twaugh@redhat.com> 2.8.1-8
8afaef
- Rebuilt.
8afaef
8afaef
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
8afaef
- rebuilt
8afaef
8afaef
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
8afaef
- rebuilt
8afaef
8afaef
* Tue Nov 19 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-5
8afaef
- i18n patch.
8afaef
8afaef
* Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-4
8afaef
- Ship translations.
8afaef
8afaef
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
8afaef
- automated rebuild
8afaef
8afaef
* Thu May 23 2002 Tim Powers <timp@redhat.com>
8afaef
- automated rebuild
8afaef
8afaef
* Mon Apr 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-1
8afaef
- 2.8.1.
8afaef
- No longer need immunix-owl-tmp patch.
8afaef
8afaef
* Wed Feb 27 2002 Tim Waugh <twaugh@redhat.com> 2.7.2-5
8afaef
- Rebuild in new environment.
8afaef
8afaef
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
8afaef
- automated rebuild
8afaef
8afaef
* Fri Nov 02 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-3
8afaef
- Make sure %%post scriplet doesn't fail if --excludedocs is used.
8afaef
8afaef
* Fri Jun 01 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-2
8afaef
- Install diff.1, since it's no longer in man-pages.
8afaef
8afaef
* Fri Mar 30 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-1
8afaef
- 2.7.2.
8afaef
8afaef
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
8afaef
- automatic rebuild
8afaef
8afaef
* Thu Jul 06 2000 Trond Eivind Glomsrød <teg@redhat.com>
8afaef
- fix %%changelog entries (escape them)
8afaef
- update source location
8afaef
- remove manual stripping
8afaef
- add URL
8afaef
8afaef
* Tue Jun 06 2000 Than Ngo <than@redhat.de>
8afaef
- add %%defattr
8afaef
- use rpm macros
8afaef
8afaef
* Wed May 31 2000 Ngo Than <than@redhat.de>
8afaef
- put man pages and info files in correct place
8afaef
- cleanup specfile
8afaef
8afaef
* Thu Feb 03 2000 Preston Brown <pbrown@redhat.com>
8afaef
- rebuild to gzip man pages.
8afaef
8afaef
* Mon Apr 19 1999 Jeff Johnson <jbj@redhat.com>
8afaef
- man pages not in %%files.
8afaef
- but avoid conflict for diff.1
8afaef
8afaef
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
8afaef
- auto rebuild in the new build environment (release 14)
8afaef
8afaef
* Sun Mar 14 1999 Jeff Johnson <jbj@redhat.com>
8afaef
- add man pages (#831).
8afaef
- add %%configure and Prefix.
8afaef
8afaef
* Thu Dec 17 1998 Cristian Gafton <gafton@redhat.com>
8afaef
- build for glibc 2.1
8afaef
8afaef
* Tue Jul 14 1998 Bill Kawakami <billk@home.com>
8afaef
- included the four man pages stolen from Slackware
8afaef
8afaef
* Tue May 05 1998 Prospector System <bugs@redhat.com>
8afaef
- translations modified for de, fr, tr
8afaef
8afaef
* Sun May 03 1998 Cristian Gafton <gafton@redhat.com>
8afaef
- fixed spec file to reference/use the $RPM_BUILD_ROOT always
8afaef
    
8afaef
* Wed Dec 31 1997 Otto Hammersmith <otto@redhat.com>
8afaef
- fixed where it looks for 'pr' (/usr/bin, rather than /bin)
8afaef
8afaef
* Fri Oct 17 1997 Donnie Barnes <djb@redhat.com>
8afaef
- added BuildRoot
8afaef
8afaef
* Sun Sep 14 1997 Erik Troan <ewt@redhat.com>
8afaef
- uses install-info
8afaef
8afaef
* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
8afaef
- built against glibc