X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=diffutils.spec;h=d05446b62bd38befece37b72dfaa7c99197c1a5a;hb=e5df5b9;hp=4526b6e1163b1524db27304fbab357e522c2f6d7;hpb=8b33d8b6ff6d1e9c1a602d2bd72522443df56f7c;p=packages%2Fdiffutils.git diff --git a/diffutils.spec b/diffutils.spec index 4526b6e..d05446b 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,110 +1,115 @@ -Summary: GNU diff Utilities -Summary(de): GNU-Diff-Utilities -Summary(fr): Utilitaires diff de GNU -Summary(pl): narzêdzia diff GNU -Summary(tr): GNU dosya karþýlaþtýrma araçlarý +Summary: A GNU collection of diff utilities +Summary(de.UTF-8): GNU-Sammlung von diff-Utilities +Summary(fr.UTF-8): Utilitaires diff de GNU +Summary(pl.UTF-8): Narzędzia diff GNU +Summary(tr.UTF-8): 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: 3.7 +Release: 1 +License: GPL v3+ +Group: Applications/Text +Source0: https://ftp.gnu.org/gnu/diffutils/%{name}-%{version}.tar.xz +# Source0-md5: 4824adc0e95dbbf11dfbdfaad6a1e461 +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 +URL: http://www.gnu.org/software/diffutils/ +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11 +BuildRequires: gettext-tools >= 0.19.2 +BuildRequires: help2man +BuildRequires: tar >= 1:1.22 +BuildRequires: texinfo +BuildRequires: xz +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. - -%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 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.UTF-8 +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.UTF-8 +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 %patch0 -p1 -%patch1 -p1 %build -CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \ -./configure %{_target_platform} \ - --prefix=/usr +%{__aclocal} -I m4 +%{__autoconf} +%{__automake} +%configure \ + PR_PROGRAM=/usr/bin/pr \ + --disable-silent-rules -make PR_PROGRAM=%{_bindir}/pr +%{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_mandir}/{man1,pl/man1} - -make prefix=$RPM_BUILD_ROOT/usr install -strip $RPM_BUILD_ROOT%{_bindir}/* - -install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install man/pl/*.1 $RPM_BUILD_ROOT%{_mandir}/pl/man1 -gzip -9nf $RPM_BUILD_ROOT%{_infodir}/diff* \ - $RPM_BUILD_ROOT%{_mandir}/{man1/*,pl/man1/*} +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT -%post -/sbin/install-info %{_infodir}/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 %{_infodir}/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) %{_bindir}/* -%{_infodir}/diff.info*gz -%{_mandir}/man1/* -%lang(pl) %{_mandir}/pl/man1/* - -%changelog -* Thu Apr 1 1999 Tomasz K³oczko - [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). +%post -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} -* Thu Sep 24 1998 Marcin Korzonek - [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). +%postun -p /sbin/postshell +-/usr/sbin/fix-info-dir -c %{_infodir} -* Tue May 05 1998 Prospector System -- translations modified for de, fr, tr - -* Sun May 03 1998 Cristian Gafton -- fixed spec file to reference/use the $RPM_BUILD_ROOT always - -* Wed Dec 31 1997 Otto Hammersmith -- fixed where it looks for 'pr' (%{_bindir}, rather than /bin) - -* Fri Oct 17 1997 Donnie Barnes -- added BuildRoot - -* Sun Sep 14 1997 Erik Troan -- uses install-info - -* Mon Jun 02 1997 Erik Troan -- built against glibc +%files -f %{name}.lang +%defattr(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README THANKS TODO +%attr(755,root,root) %{_bindir}/cmp +%attr(755,root,root) %{_bindir}/diff +%attr(755,root,root) %{_bindir}/diff3 +%attr(755,root,root) %{_bindir}/sdiff +%{_infodir}/diffutils.info* +%{_mandir}/man1/cmp.1* +%{_mandir}/man1/diff.1* +%{_mandir}/man1/diff3.1* +%{_mandir}/man1/sdiff.1* +%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/*