|
|
13efe10 |
Summary: A GNU collection of diff utilities
|
|
cvsdist |
70d82c0 |
Name: diffutils
|
|
|
d145ae3 |
Version: 3.1
|
|
|
780813e |
Release: 1%{?dist}
|
|
cvsdist |
70d82c0 |
Group: Applications/Text
|
|
cvsdist |
70d82c0 |
URL: http://www.gnu.org/software/diffutils/diffutils.html
|
|
|
780813e |
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
|
|
|
f5a08e3 |
Patch4: diffutils-cmp-s-empty.patch
|
|
|
13efe10 |
License: GPLv2+
|
|
|
13efe10 |
Requires(post): /sbin/install-info
|
|
|
13efe10 |
Requires(preun): /sbin/install-info
|
|
|
13efe10 |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
ab0dcc7 |
BuildRequires: help2man
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%description
|
|
cvsdist |
70d82c0 |
Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
|
|
cvsdist |
70d82c0 |
compares two files and shows the differences, line by line. The cmp
|
|
cvsdist |
70d82c0 |
command shows the offset and line numbers where two files differ, or
|
|
cvsdist |
70d82c0 |
cmp can show the characters that differ between the two files. The
|
|
cvsdist |
70d82c0 |
diff3 command shows the differences between three files. Diff3 can be
|
|
cvsdist |
70d82c0 |
used when two people have made independent changes to a common
|
|
cvsdist |
70d82c0 |
original; diff3 can produce a merged file that contains both sets of
|
|
cvsdist |
70d82c0 |
changes and warnings about conflicts. The sdiff command can be used
|
|
cvsdist |
70d82c0 |
to merge two files interactively.
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
Install diffutils if you need to compare text files.
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%prep
|
|
cvsdist |
70d82c0 |
%setup -q
|
|
|
f5a08e3 |
# For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
|
|
|
f5a08e3 |
%patch4 -p1 -b .cmp-s-empty
|
|
|
f5a08e3 |
|
|
cvsdist |
70d82c0 |
%build
|
|
cvsdist |
70d82c0 |
%configure
|
|
cvsdist |
70d82c0 |
make PR_PROGRAM=%{_bindir}/pr
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%install
|
|
cvsdist |
70d82c0 |
rm -rf $RPM_BUILD_ROOT
|
|
|
13efe10 |
make DESTDIR=$RPM_BUILD_ROOT install
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
a2998f5 |
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|
cvsdist |
a2998f5 |
%find_lang %{name}
|
|
cvsdist |
a2998f5 |
|
|
|
780813e |
%check
|
|
|
780813e |
make check
|
|
|
780813e |
|
|
cvsdist |
70d82c0 |
%post
|
|
|
4d7233f |
if [ -f %{_infodir}/diff.info.gz ]; then
|
|
|
4d7233f |
/sbin/install-info %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
|
|
|
4d7233f |
fi
|
|
cvsdist |
b1fcd51 |
exit 0
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%preun
|
|
cvsdist |
70d82c0 |
if [ $1 = 0 ]; then
|
|
cvsdist |
70d82c0 |
/sbin/install-info --delete %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
|
|
cvsdist |
70d82c0 |
fi
|
|
|
c9a8fb4 |
exit 0
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%clean
|
|
cvsdist |
70d82c0 |
rm -rf $RPM_BUILD_ROOT
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
a2998f5 |
%files -f %{name}.lang
|
|
cvsdist |
70d82c0 |
%defattr(-,root,root)
|
|
|
ee05c04 |
%doc COPYING NEWS README
|
|
cvsdist |
70d82c0 |
%{_bindir}/*
|
|
cvsdist |
70d82c0 |
%{_mandir}/*/*
|
|
|
d145ae3 |
%{_infodir}/diffutils.info*gz
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%changelog
|
|
|
d145ae3 |
* Thu Aug 11 2011 Tim Waugh <twaugh@redhat.com> 3.1-1
|
|
|
d145ae3 |
- 3.1.
|
|
|
d145ae3 |
|
|
|
780813e |
* Wed Apr 13 2011 Tim Waugh <twaugh@redhat.com> 3.0-1
|
|
|
780813e |
- 3.0 (bug #566482).
|
|
|
780813e |
- The i18n patch is dropped for the time being.
|
|
|
780813e |
|
|
|
cc6ff26 |
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-30
|
|
|
cc6ff26 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
cc6ff26 |
|
|
|
f5a08e3 |
* Fri Jun 25 2010 Tim Waugh <twaugh@redhat.com> 2.8.1-29
|
|
|
f5a08e3 |
- For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
|
|
|
f5a08e3 |
|
|
|
ab0dcc7 |
* Wed Apr 21 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-28
|
|
|
ab0dcc7 |
- Build requires help2man (bug #577325). Fixes empty diff man page.
|
|
|
ab0dcc7 |
|
|
|
7e7a5bb |
* Wed Mar 3 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-27
|
|
|
7e7a5bb |
- Added comments for all patches.
|
|
|
7e7a5bb |
|
|
|
ee05c04 |
* Wed Mar 3 2010 Tim Waugh <twaugh@redhat.com> - 2.8.1-26
|
|
|
ee05c04 |
- Use upstream man pages.
|
|
|
ee05c04 |
- Ship COPYING file.
|
|
|
ee05c04 |
|
|
|
4d7233f |
* Tue Aug 11 2009 Tim Waugh <twaugh@redhat.com> 2.8.1-25
|
|
|
4d7233f |
- Only try to install the info file if it exists so that package
|
|
|
4d7233f |
installation does not fail with --excludedocs (bug #515919).
|
|
|
4d7233f |
|
|
|
c62b92e |
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-24
|
|
|
c62b92e |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
c62b92e |
|
|
|
cdd53a2 |
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.1-23
|
|
|
cdd53a2 |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
cdd53a2 |
|
|
|
8711fc7 |
* Fri Feb 13 2009 Tim Waugh <twaugh@redhat.com> 2.8.1-22
|
|
|
8711fc7 |
- Fixed 'sdiff -E' (bug #484892).
|
|
|
8711fc7 |
|
|
|
8fdc8d1 |
* Wed Feb 13 2008 Tim Waugh <twaugh@redhat.com> 2.8.1-21
|
|
|
8fdc8d1 |
- Rebuild for GCC 4.3.
|
|
|
8fdc8d1 |
|
|
|
13efe10 |
* Wed Jan 2 2008 Tim Waugh <twaugh@redhat.com> 2.8.1-20
|
|
|
13efe10 |
- Converted spec file to UTF-8 (bug #225696).
|
|
|
13efe10 |
- Fixed summary (bug #225696).
|
|
|
13efe10 |
- Fixed PreReq (bug #225696).
|
|
|
13efe10 |
- Removed Prefix (bug #225696).
|
|
|
13efe10 |
- Fixed build root (bug #225696).
|
|
|
13efe10 |
- Avoid %%makeinstall (bug #225696).
|
|
|
13efe10 |
- Fixed license tag (bug #225696).
|
|
|
13efe10 |
|
|
|
ccd76d0 |
* Tue Nov 6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-19
|
|
|
ccd76d0 |
- Rebuilt.
|
|
|
ccd76d0 |
|
|
|
1961a87 |
* Tue Nov 6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-18
|
|
|
ccd76d0 |
- Fixed multibyte speed improvement patch (bug #363831).
|
|
|
1961a87 |
|
|
|
8f1372f |
* Tue Aug 14 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-17
|
|
|
8f1372f |
- Multibyte speed improvement (bug #252117).
|
|
|
8f1372f |
|
|
|
c9a8fb4 |
* Mon Jan 22 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-16
|
|
|
c9a8fb4 |
- Make scriptlet unconditionally succeed (bug #223683).
|
|
|
c9a8fb4 |
|
|
|
7f24e88 |
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2.2
|
|
|
7f24e88 |
- rebuild
|
|
|
7f24e88 |
|
|
|
d0518d3 |
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2.1
|
|
|
d0518d3 |
- bump again for double-long bug on ppc(64)
|
|
|
d0518d3 |
|
|
|
4d80663 |
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.8.1-15.2
|
|
|
4d80663 |
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
4d80663 |
|
|
|
2dc5112 |
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
|
|
2dc5112 |
- rebuilt
|
|
|
2dc5112 |
|
|
|
df04bbf |
* Wed Apr 6 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-15
|
|
|
5fd287d |
- Fixed sdiff exit code handling (bug #152967).
|
|
|
5fd287d |
|
|
|
7c5b45c |
* Wed Mar 2 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-14
|
|
|
7c5b45c |
- Rebuild for new GCC.
|
|
|
7c5b45c |
|
|
|
4e00312 |
* Wed Feb 9 2005 Tim Waugh <twaugh@redhat.com> 2.8.1-13
|
|
|
4e00312 |
- Rebuilt.
|
|
|
4e00312 |
|
|
cvsdist |
b7f07cd |
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
|
|
cvsdist |
b7f07cd |
- rebuilt
|
|
cvsdist |
b7f07cd |
|
|
cvsdist |
f330621 |
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
|
cvsdist |
f330621 |
- rebuilt
|
|
cvsdist |
f330621 |
|
|
cvsdist |
beabbaa |
* Thu Jan 8 2004 Tim Waugh <twaugh@redhat.com> 2.8.1-10
|
|
cvsdist |
beabbaa |
- Fix mistaken use of '|' instead of '||'.
|
|
cvsdist |
beabbaa |
|
|
cvsdist |
57e7253 |
* Sat Oct 25 2003 Tim Waugh <twaugh@redhat.com> 2.8.1-9
|
|
cvsdist |
57e7253 |
- Rebuilt.
|
|
cvsdist |
57e7253 |
|
|
cvsdist |
57e7253 |
* Tue Jun 17 2003 Tim Waugh <twaugh@redhat.com> 2.8.1-8
|
|
cvsdist |
57e7253 |
- Rebuilt.
|
|
cvsdist |
57e7253 |
|
|
cvsdist |
57e7253 |
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
|
cvsdist |
57e7253 |
- rebuilt
|
|
cvsdist |
57e7253 |
|
|
cvsdist |
a2998f5 |
* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
|
|
cvsdist |
a2998f5 |
- rebuilt
|
|
cvsdist |
a2998f5 |
|
|
cvsdist |
a2998f5 |
* Tue Nov 19 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-5
|
|
cvsdist |
a2998f5 |
- i18n patch.
|
|
cvsdist |
a2998f5 |
|
|
cvsdist |
a2998f5 |
* Tue Oct 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-4
|
|
cvsdist |
a2998f5 |
- Ship translations.
|
|
cvsdist |
a2998f5 |
|
|
cvsdist |
c6cb3ea |
* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
|
|
cvsdist |
c6cb3ea |
- automated rebuild
|
|
cvsdist |
c6cb3ea |
|
|
cvsdist |
654f479 |
* Thu May 23 2002 Tim Powers <timp@redhat.com>
|
|
cvsdist |
654f479 |
- automated rebuild
|
|
cvsdist |
654f479 |
|
|
cvsdist |
654f479 |
* Mon Apr 22 2002 Tim Waugh <twaugh@redhat.com> 2.8.1-1
|
|
cvsdist |
654f479 |
- 2.8.1.
|
|
cvsdist |
654f479 |
- No longer need immunix-owl-tmp patch.
|
|
cvsdist |
654f479 |
|
|
cvsdist |
b1fcd51 |
* Wed Feb 27 2002 Tim Waugh <twaugh@redhat.com> 2.7.2-5
|
|
cvsdist |
b1fcd51 |
- Rebuild in new environment.
|
|
cvsdist |
b1fcd51 |
|
|
cvsdist |
b1fcd51 |
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
|
|
cvsdist |
b1fcd51 |
- automated rebuild
|
|
cvsdist |
b1fcd51 |
|
|
cvsdist |
b1fcd51 |
* Fri Nov 02 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-3
|
|
cvsdist |
b1fcd51 |
- Make sure %%post scriplet doesn't fail if --excludedocs is used.
|
|
cvsdist |
b1fcd51 |
|
|
cvsdist |
2d3189a |
* Fri Jun 01 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-2
|
|
cvsdist |
2d3189a |
- Install diff.1, since it's no longer in man-pages.
|
|
cvsdist |
2d3189a |
|
|
cvsdist |
2d3189a |
* Fri Mar 30 2001 Tim Waugh <twaugh@redhat.com> 2.7.2-1
|
|
cvsdist |
2d3189a |
- 2.7.2.
|
|
cvsdist |
ee33d98 |
|
|
cvsdist |
70d82c0 |
* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
|
|
cvsdist |
70d82c0 |
- automatic rebuild
|
|
cvsdist |
70d82c0 |
|
|
|
13efe10 |
* Thu Jul 06 2000 Trond Eivind Glomsrød <teg@redhat.com>
|
|
cvsdist |
70d82c0 |
- fix %%changelog entries (escape them)
|
|
cvsdist |
70d82c0 |
- update source location
|
|
cvsdist |
70d82c0 |
- remove manual stripping
|
|
cvsdist |
70d82c0 |
- add URL
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Tue Jun 06 2000 Than Ngo <than@redhat.de>
|
|
cvsdist |
70d82c0 |
- add %%defattr
|
|
cvsdist |
70d82c0 |
- use rpm macros
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Wed May 31 2000 Ngo Than <than@redhat.de>
|
|
cvsdist |
70d82c0 |
- put man pages and info files in correct place
|
|
cvsdist |
70d82c0 |
- cleanup specfile
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Thu Feb 03 2000 Preston Brown <pbrown@redhat.com>
|
|
cvsdist |
70d82c0 |
- rebuild to gzip man pages.
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Mon Apr 19 1999 Jeff Johnson <jbj@redhat.com>
|
|
cvsdist |
70d82c0 |
- man pages not in %%files.
|
|
cvsdist |
70d82c0 |
- but avoid conflict for diff.1
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
|
|
cvsdist |
70d82c0 |
- auto rebuild in the new build environment (release 14)
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Sun Mar 14 1999 Jeff Johnson <jbj@redhat.com>
|
|
cvsdist |
70d82c0 |
- add man pages (#831).
|
|
cvsdist |
70d82c0 |
- add %%configure and Prefix.
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Thu Dec 17 1998 Cristian Gafton <gafton@redhat.com>
|
|
cvsdist |
70d82c0 |
- build for glibc 2.1
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Tue Jul 14 1998 Bill Kawakami <billk@home.com>
|
|
cvsdist |
70d82c0 |
- included the four man pages stolen from Slackware
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Tue May 05 1998 Prospector System <bugs@redhat.com>
|
|
cvsdist |
70d82c0 |
- translations modified for de, fr, tr
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Sun May 03 1998 Cristian Gafton <gafton@redhat.com>
|
|
cvsdist |
70d82c0 |
- fixed spec file to reference/use the $RPM_BUILD_ROOT always
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Wed Dec 31 1997 Otto Hammersmith <otto@redhat.com>
|
|
cvsdist |
70d82c0 |
- fixed where it looks for 'pr' (/usr/bin, rather than /bin)
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Fri Oct 17 1997 Donnie Barnes <djb@redhat.com>
|
|
cvsdist |
70d82c0 |
- added BuildRoot
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Sun Sep 14 1997 Erik Troan <ewt@redhat.com>
|
|
cvsdist |
70d82c0 |
- uses install-info
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
|
|
cvsdist |
70d82c0 |
- built against glibc
|