[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).

Changed files:
    diffutils.spec -> 1.2

diff --git a/diffutils.spec b/diffutils.spec
index 6585813236c0d8677b427b966995cd9731e68fdc..d7b1e35fe0ed396449ef84879960db5e469bbf12 100644 (file)
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,22 +1,30 @@
-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ý
-Name:        diffutils
-Version:     2.7
-Release:     12
-Group:       Utilities/Text
-Source:      ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
-Copyright:   GPL
-Prereq:      /sbin/install-info
-Buildroot:   /tmp/%{name}-%{version}-root
+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ý
+Name:          diffutils
+Version:       2.7
+Release:       15
+Group:         Utilities/Text
+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
 
 %description
-The diff utilities can be used to compare files, and generate a record
-of the "differences" between files.  This record can be used by the
-patch program to bring one file up to date with the other.  All these
-utilities (except cmp) only work on 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.
+
+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 
@@ -26,36 +34,49 @@ pracuj
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s ./configure --prefix=/usr 
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="-s" \
+./configure \
+       --prefix=/usr 
+
 make PR_PROGRAM=/usr/bin/pr
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make prefix=$RPM_BUILD_ROOT/usr install
-gzip -9nf $RPM_BUILD_ROOT/usr/info/diff*
-
 strip $RPM_BUILD_ROOT/usr/bin/*
 
+gzip -9nf $RPM_BUILD_ROOT/usr/info/diff*
+
 %post
-/sbin/install-info /usr/info/diff.info.gz /usr/info/dir --entry="* diff: (diff).                 The GNU diff."
+/sbin/install-info /usr/info/diff.info.gz /etc/info-dir
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete /usr/info/diff.info.gz /usr/info/dir --entry="* diff: (diff).                 The GNU diff."
+if [ "$1" = "0" ]; then
+       /sbin/install-info --delete /usr/info/diff.info.gz /etc/info-dir
 fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644, root, root, 755)
+%defattr(644,root,root,755)
 %doc NEWS README
-%attr(755, root, root) /usr/bin/*
-%attr(644, root, root) /usr/info/diff.info*gz
+%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,