From 9bd030f018c028bd74370865ef3b01ef826de4de Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 15 Feb 2010 12:23:08 +0000
Subject: [PATCH] - Don't requires hayesesp.h (bug #564974).

---
 setserial-hayesesp.patch | 30 ++++++++++++++++++++++++++++++
 setserial.spec           |  7 ++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 setserial-hayesesp.patch

diff --git a/setserial-hayesesp.patch b/setserial-hayesesp.patch
new file mode 100644
index 0000000..c669d88
--- /dev/null
+++ b/setserial-hayesesp.patch
@@ -0,0 +1,30 @@
+diff -up setserial-2.17/setserial.c.hayesesp setserial-2.17/setserial.c
+--- setserial-2.17/setserial.c.hayesesp	2010-02-15 12:20:59.104048442 +0000
++++ setserial-2.17/setserial.c	2010-02-15 12:21:42.368924088 +0000
+@@ -356,7 +356,7 @@ void set_multiport(char *device, int fd,
+ }
+ #endif
+ 
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ void print_hayesesp(int fd)
+ {
+ 	struct hayes_esp_config esp;
+@@ -453,7 +453,7 @@ void get_serial(char *device)
+ 		print_flags(&serinfo, "\tFlags: ", "");
+ 		printf("\n\n");
+ 
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ 		print_hayesesp(fd);
+ #endif
+ 	} else if (verbosity==0) {
+@@ -593,7 +593,7 @@ void set_serial(char *device, char ** ar
+ 			}
+ 			set_multiport(device, fd, &arg);
+ 			break;
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ 		case CMD_RX_TRIG:
+ 		case CMD_TX_TRIG:
+ 		case CMD_FLOW_OFF:
diff --git a/setserial.spec b/setserial.spec
index f2aef24..a7a2d7b 100644
--- a/setserial.spec
+++ b/setserial.spec
@@ -3,12 +3,13 @@
 Summary: A utility for configuring serial ports
 Name: setserial
 Version: 2.17
-Release: 24%{?dist}
+Release: 25%{?dist}
 Source: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Patch0: setserial-2.17-fhs.patch
 Patch1: setserial-2.17-rc.patch
 Patch2: setserial-2.17-readme.patch
 Patch3: setserial-2.17-spelling.patch
+Patch4: setserial-hayesesp.patch
 License: GPL+
 Group: Applications/System
 URL: http://setserial.sourceforge.net/
@@ -28,6 +29,7 @@ port and IRQ that a particular serial device is using, and more.
 %patch1 -p1 -b .rc
 %patch2 -p1 -b .readme
 %patch3 -p1 -b .spelling
+%patch4 -p1 -b .hayesesp
 rm -f config.cache
 
 %build
@@ -50,6 +52,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/*
 
 %changelog
+* Mon Feb 15 2010 Tim Waugh <twaugh@redhat.com> 2.17-25
+- Don't requires hayesesp.h (bug #564974).
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.17-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild