|
cvsdist |
70d82c0 |
Summary: A GNU collection of diff utilities.
|
|
cvsdist |
70d82c0 |
Name: diffutils
|
|
cvsdist |
654f479 |
Version: 2.8.1
|
|
cvsdist |
f330621 |
Release: 11
|
|
cvsdist |
70d82c0 |
Group: Applications/Text
|
|
cvsdist |
70d82c0 |
URL: http://www.gnu.org/software/diffutils/diffutils.html
|
|
cvsdist |
70d82c0 |
Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
|
|
cvsdist |
70d82c0 |
Source1: cmp.1
|
|
cvsdist |
70d82c0 |
Source2: diff.1
|
|
cvsdist |
70d82c0 |
Source3: diff3.1
|
|
cvsdist |
70d82c0 |
Source4: sdiff.1
|
|
cvsdist |
a2998f5 |
Patch0: diffutils-2.8.4-i18n.patch
|
|
cvsdist |
beabbaa |
Patch1: diffutils-2.8.1-badc.patch
|
|
cvsdist |
70d82c0 |
License: GPL
|
|
cvsdist |
70d82c0 |
Prefix: %{_prefix}
|
|
cvsdist |
70d82c0 |
Prereq: /sbin/install-info
|
|
cvsdist |
70d82c0 |
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
|
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
|
|
cvsdist |
a2998f5 |
%patch0 -p1 -b .i18n
|
|
cvsdist |
beabbaa |
%patch1 -p1 -b .badc
|
|
cvsdist |
70d82c0 |
|
|
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
|
|
cvsdist |
70d82c0 |
%makeinstall
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
( cd $RPM_BUILD_ROOT
|
|
cvsdist |
70d82c0 |
gzip -9nf .%{_infodir}/diff*
|
|
cvsdist |
70d82c0 |
mkdir -p .%{_mandir}/man1
|
|
cvsdist |
2d3189a |
for manpage in %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4}
|
|
cvsdist |
70d82c0 |
do
|
|
cvsdist |
70d82c0 |
install -m 0644 ${manpage} .%{_mandir}/man1
|
|
cvsdist |
70d82c0 |
done
|
|
cvsdist |
70d82c0 |
)
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
a2998f5 |
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
|
cvsdist |
a2998f5 |
%find_lang %{name}
|
|
cvsdist |
a2998f5 |
|
|
cvsdist |
70d82c0 |
%post
|
|
cvsdist |
70d82c0 |
/sbin/install-info %{_infodir}/diff.info.gz %{_infodir}/dir --entry="* diff: (diff). The GNU diff."
|
|
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
|
|
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)
|
|
cvsdist |
70d82c0 |
%doc NEWS README
|
|
cvsdist |
70d82c0 |
%{_bindir}/*
|
|
cvsdist |
70d82c0 |
%{_mandir}/*/*
|
|
cvsdist |
70d82c0 |
%{_infodir}/diff.info*gz
|
|
cvsdist |
70d82c0 |
|
|
cvsdist |
70d82c0 |
%changelog
|
|
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 |
|
|
cvsdist |
70d82c0 |
* 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
|