From de1517d87fc631291e35387dc50a9dc87868b491 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 20 Oct 2007 05:24:37 +0000
Subject: [PATCH 1/2] Initialize branch F-8 for diffutils

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..e9e7ccd
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-8

From 8f4b4e84a9faacbc6805edda0103698f1e36a0bb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 6 Nov 2007 12:12:56 +0000
Subject: [PATCH 2/2] - Fixed multibyte speed improvement patch (bug #363381).

---
 diffutils-2.8.4-i18n.patch | 2 +-
 diffutils.spec             | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/diffutils-2.8.4-i18n.patch b/diffutils-2.8.4-i18n.patch
index 2042c9f..d601e6f 100644
--- a/diffutils-2.8.4-i18n.patch
+++ b/diffutils-2.8.4-i18n.patch
@@ -376,7 +376,7 @@
  	      continue;
  
 -	    if (! lines_differ (eqline, ip))
-+	    if (! lines_differ (eqline, eqs[i].length, ip, length))
++	    if (! lines_differ (eqline, eqs[i].length + 1, ip, length + 1))
  	      break;
  	  }
  
diff --git a/diffutils.spec b/diffutils.spec
index 9787385..367871d 100644
--- a/diffutils.spec
+++ b/diffutils.spec
@@ -1,7 +1,7 @@
 Summary: A GNU collection of diff utilities.
 Name: diffutils
 Version: 2.8.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Group: Applications/Text
 URL: http://www.gnu.org/software/diffutils/diffutils.html
 Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/diff.info*gz
 
 %changelog
+* Tue Nov  6 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-18
+- Fixed multibyte speed improvement patch (bug #363381).
+
 * Tue Aug 14 2007 Tim Waugh <twaugh@redhat.com> 2.8.1-17
 - Multibyte speed improvement (bug #252117).