- bump to release3,

- merge context patch from rawhde (fix handling of context diffs so that
  it handles GNU diff's output style),
- regenerate ac/am files,
- added Provides/Obsolees for interdiff.

Changed files:
    patchutils.spec -> 1.3

diff --git a/patchutils.spec b/patchutils.spec
index 797a48204a8bb597b591c0fff132f63c56502ab6..27e2fc7a77c48da7f89e91ebaff4cf092759855f 100644 (file)
--- a/patchutils.spec
+++ b/patchutils.spec
@@ -2,18 +2,23 @@ Summary:      Patchutils is a small collection of programs that operate on patch file
 Summary(pl):   Kolekcja ma³ych programów operuj±cych na plikach patch
 Name:          patchutils
 Version:       0.2.11
-Release:       1
+Release:       3
 License:       GPL
 Group:         Applications/Text
 Source0:       http://cyberelk.net/tim/data/patchutils/stable/%{name}-%{version}.tar.gz
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-fixcvsdiff.patch
+Patch2:                %{name}-context.patch
 URL:           http://cyberelk.net/tim/patchutils/
-Requires:      diffutils
-Requires:      patch
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: diffutils
 BuildRequires: patch
+Requires:      diffutils
+Requires:      patch
+Provides:      interdiff
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     interdiff
 
 %description
 Interdiff generates an incremental patch from two patches against a
@@ -78,9 +83,14 @@ zawiera okre
 %prep
 %setup -q
 %patch0 -p1
-%patch1 
+%patch1 -p0
+%patch2 -p1
 
 %build
+rm -f missing
+aclocal
+autoconf
+automake -a -c -f
 %configure
 %{__make}