From 825d478439fd8634d5bac21378cdcadb84e5efa9 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Tue, 13 Nov 2007 14:33:15 +0000
Subject: [PATCH]

---
 .cvsignore              |  1 +
 sources                 |  2 +-
 which-2.14-broken.patch | 19 -------------------
 which.spec              |  2 +-
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 0ed9d0f..391616e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 which-2.16.tar.gz
+which-2.18.tar.gz
diff --git a/sources b/sources
index 1ddeef4..20b8e10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-830b83af48347a9a3520f561e47cbc9b  which-2.16.tar.gz
+42d51938e48b91f6e19fabf216f5c3e9  which-2.18.tar.gz
diff --git a/which-2.14-broken.patch b/which-2.14-broken.patch
index c0b3911..8f5d735 100644
--- a/which-2.14-broken.patch
+++ b/which-2.14-broken.patch
@@ -12,22 +12,3 @@
      result = xmalloc (result_size = (strlen (string) + 16));
    else
      result = xmalloc (result_size = (strlen (string) + 1));
---- which-2.14/which.c.orig	Mon Dec  9 18:58:28 2002
-+++ which-2.14/which.c	Mon Dec  9 18:59:52 2002
-@@ -22,6 +22,7 @@
- #include "getopt.h"
- #include "tilde/tilde.h"
- #include "bash.h"
-+#include <ctype.h>
- 
- static const char *progname;
- 
-@@ -536,7 +537,7 @@
-     while (fgets(buf, sizeof(buf), stdin))
-     {
-       int looks_like_function_start = 0;
--      int function_start_version_205b;
-+      int function_start_version_205b = 0;
-       if (read_functions)
-       {
- 	// bash version 2.0.5a and older output a pattern for `str' like
diff --git a/which.spec b/which.spec
index ced9920..811db27 100644
--- a/which.spec
+++ b/which.spec
@@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING AUTHORS LICENSE EXAMPLES README AUTHORS NEWS
+%doc COPYING EXAMPLES README AUTHORS NEWS
 /etc/profile.d/which-2.*
 %{_bindir}/*
 %{_infodir}/which.info.gz