diff --git a/diffutils-sdiff-E.patch b/diffutils-sdiff-E.patch new file mode 100644 index 0000000..575adaa --- /dev/null +++ b/diffutils-sdiff-E.patch @@ -0,0 +1,12 @@ +diff -up diffutils-2.8.1/src/sdiff.c.sdiff-E diffutils-2.8.1/src/sdiff.c +--- diffutils-2.8.1/src/sdiff.c.sdiff-E 2009-02-13 17:00:38.000000000 +0000 ++++ diffutils-2.8.1/src/sdiff.c 2009-02-13 17:31:08.000000000 +0000 +@@ -464,7 +464,7 @@ main (int argc, char *argv[]) + diffarg (DEFAULT_DIFF_PROGRAM); + + /* parse command line args */ +- while ((opt = getopt_long (argc, argv, "abBdHiI:lo:stvw:W", longopts, 0)) ++ while ((opt = getopt_long (argc, argv, "abBdEHiI:lo:stvw:W", longopts, 0)) + != -1) + { + switch (opt) diff --git a/diffutils.spec b/diffutils.spec index 0d769a8..f31253e 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: 21%{?dist} +Release: 22%{?dist} Group: Applications/Text URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz @@ -12,6 +12,7 @@ Source4: sdiff.1 Patch0: diffutils-2.8.4-i18n.patch Patch1: diffutils-2.8.1-badc.patch Patch2: diffutils-sdiff.patch +Patch3: diffutils-sdiff-E.patch License: GPLv2+ Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -35,6 +36,7 @@ Install diffutils if you need to compare text files. %patch0 -p1 -b .i18n %patch1 -p1 -b .badc %patch2 -p1 -b .sdiff +%patch3 -p1 -b .sdiff-E %build %configure @@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %{_infodir}/diff.info*gz %changelog +* Fri Feb 13 2009 Tim Waugh 2.8.1-22 +- Fixed 'sdiff -E' (bug #484892). + * Wed Feb 13 2008 Tim Waugh 2.8.1-21 - Rebuild for GCC 4.3.