-Summary: GNU diff Utilities
-Summary(de): GNU-Diff-Utilities
+Summary: A GNU collection of diff utilities
+Summary(de): GNU-Sammlung von diff-Utilities
Summary(fr): Utilitaires diff de GNU
-Summary(pl): narzêdzia diff GNU
+Summary(pl): Narzêdzia diff GNU
Summary(tr): GNU dosya karþýlaþtýrma araçlarý
Name: diffutils
-Version: 2.7
-Release: 15
-Group: Utilities/Text
-Group(pl): Narzêdzia/Tekst
-Copyright: GPL
-Source: ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
-Patch0: diffutils-man.patch
-Patch1: diffutils-info.patch
-Prereq: /sbin/install-info
-Buildroot: /tmp/%{name}-%{version}-root
+Version: 2.8.4
+Release: 3
+License: GPL
+Group: Applications/Text
+Source0: ftp://alpha.gnu.org/gnu/diffutils/%{name}-%{version}.tar.gz
+# Source0-md5: a9c028579abc79ecd6842d60a13abf1d
+Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source1-md5: 34a7ab56f975ff7e439ea13923ec8ae4
+Patch0: %{name}-info.patch
+Patch1: %{name}-pl.po-update.patch
+URL: http://www.gnu.org/software/diffutils/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
-compares two files and shows the differences, line by line. The cmp command
-shows the offset and line numbers where two files differ, or cmp can show
-the characters that differ between the two files. The diff3 command shows
-the differences between three files. Diff3 can be used when two people have
-made independent changes to a common original; diff3 can produce a merged
-file that contains both persons changes and warnings about conflicts. The
-sdiff command can be used to merge two files interactively.
-
-Install diffutils if you need to compare text files.
+Diffutils includes four utilities: diff, cmp, diff3 and sdiff. Diff
+compares two files and shows the differences, line by line. The cmp
+command shows the offset and line numbers where two files differ, or
+cmp can show the characters that differ between the two files. The
+diff3 command shows the differences between three files. Diff3 can be
+used when two people have made independent changes to a common
+original; diff3 can produce a merged file that contains both persons
+changes and warnings about conflicts. The sdiff command can be used to
+merge two files interactively.
+
+%description -l de
+Diffutils enthält 4 Utilities: diff, cmp, diff3 und sdiff. Diff
+vergleicht zwei Dateien und zeigt die Unterschiede, Zeile für Zeile.
+cmp zeigt Offset und Zeilennummern, in denen sich zwei Dateien
+unterscheiden, cmp kann auch die Zeichen zeigen, die sich
+unterscheiden. diff3 zeigt die Unterschiede zwischen 3 Dateien. Diff3
+kann benutzt werden, wenn zwei Leute unabhängige Änderungen zu einem
+gemeinsamen Ursprung gemacht haben; diff3 kann eine Datei erzeugen,
+die die Änderungen beider Personen und Warnungen zu Konflikten
+enthält. Der sdiff-Befehl kann benutzt werden, um zwei Dateien
+interaktiv zusammenzufügen.
%description -l pl
-Narzêdzia diff s± u¿ywane do porównywania zawarto¶ci plików i tworzenia
-zbioru z ró¿nicami. Mo¿na go potem u¿yæ (za pomoc± programu patch) do
-uaktualnienia starszego pliku. Wszystkie narzêdzia (za wyj±tkiem cmp)
-pracuj± tylko na plikach tekstowych.
+Diffutils zawiera nastêpuj±ce programy: diff, cmp, diff3 i sdiff. diff
+s³u¿y do porównywania dwóch plików wy¶wietlaj±c ró¿nice miêdzy nimi
+linia po linii. Polecenie cmp podaje numery bajtów na których
+wystêpuj± ró¿nice miêdzy porównywanymi plikami. diff3 pokazuje ró¿nice
+miedzy trzema plikami. diff3 mo¿e byæ u¿yty np. w sytuacji kiedy dwie
+osoby wykona³y zmianê niezale¿nie od siebie na jednym pliku,
+pozwalaj±c uzyskaæ po³±czon± listê zmian zawieraj±c± informacje o tym,
+kto co zmieni³, a tak¿e informacje o konfliktach miedzy tymi dwoma
+modyfikacjami. Polecenie sdiff s³u¿y do interakcyjnego ³±czenia dwóch
+plików.
%prep
%setup -q
%patch1 -p1
%build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
-./configure %{_target} \
- --prefix=/usr
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+%configure \
+ PR_PROGRAM=/usr/bin/pr
-make PR_PROGRAM=/usr/bin/pr
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/usr/man/{man1,pl/man1}
-
-make prefix=$RPM_BUILD_ROOT/usr install
-strip $RPM_BUILD_ROOT/usr/bin/*
+install -d $RPM_BUILD_ROOT%{_mandir}
-install man/*.1 $RPM_BUILD_ROOT/usr/man/man1
-install man/pl/*.1 $RPM_BUILD_ROOT/usr/man/pl/man1
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
-gzip -9nf $RPM_BUILD_ROOT/usr/info/diff* \
- $RPM_BUILD_ROOT/usr/man/{man1/*,pl/man1/*}
-
-%post
-/sbin/install-info /usr/info/diff.info.gz /etc/info-dir
+bzip2 -dc %{SOURCE1} | tar xvf - -C $RPM_BUILD_ROOT%{_mandir}
-%preun
-if [ "$1" = "0" ]; then
- /sbin/install-info --delete /usr/info/diff.info.gz /etc/info-dir
-fi
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
-%files
-%defattr(644,root,root,755)
-%doc NEWS README
-%attr(755,root,root) /usr/bin/*
-/usr/info/diff.info*gz
-/usr/man/man1/*
-%lang(pl) /usr/man/pl/man1/*
-
-%changelog
-* Thu Apr 1 1999 Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
- [2.7-15]
-- added cmp(1), diff(1), diff3(1), sdiff(1) man pages and pl man page
- diff(1),
-- standarized {un}registration info pages (added diffutils-info.patch).
-
-* Thu Sep 24 1998 Marcin Korzonek <mkorz@shadow.eu.org>
- [2.7-12]
-- added pl translation,
-- adde -q %setup parameter,
-- moved CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" from make
- to configure (as a much safer solution).
-
-* Tue May 05 1998 Prospector System <bugs@redhat.com>
-- translations modified for de, fr, tr
-
-* Sun May 03 1998 Cristian Gafton <gafton@redhat.com>
-- fixed spec file to reference/use the $RPM_BUILD_ROOT always
-
-* Wed Dec 31 1997 Otto Hammersmith <otto@redhat.com>
-- fixed where it looks for 'pr' (/usr/bin, rather than /bin)
-
-* Fri Oct 17 1997 Donnie Barnes <djb@redhat.com>
-- added BuildRoot
+%post
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-* Sun Sep 14 1997 Erik Troan <ewt@redhat.com>
-- uses install-info
+%postun
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
-* Mon Jun 02 1997 Erik Troan <ewt@redhat.com>
-- built against glibc
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc NEWS README
+%attr(755,root,root) %{_bindir}/*
+%{_infodir}/diff.info*
+%{_mandir}/man1/*
+%lang(de) %{_mandir}/de/man1/*
+%lang(es) %{_mandir}/es/man1/*
+%lang(fr) %{_mandir}/fr/man1/*
+%lang(hu) %{_mandir}/hu/man1/*
+%lang(it) %{_mandir}/it/man1/*
+%lang(ko) %{_mandir}/ko/man1/*
+%lang(nl) %{_mandir}/nl/man1/*
+%lang(pl) %{_mandir}/pl/man1/*
+%lang(pt) %{_mandir}/pt/man1/*
+%lang(ru) %{_mandir}/ru/man1/*
projects / packages / diffutils.git / blobdiff