From 071db6a8d96a6c08443dba55038304f028ba2edf Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Jul 20 2012 06:12:18 +0000
Subject: Remove nested include (fix compilation in rawhide)


---

diff --git a/ftp.spec b/ftp.spec
index 779fcea..539faae 100644
--- a/ftp.spec
+++ b/ftp.spec
@@ -1,7 +1,7 @@
 Summary: The standard UNIX FTP (File Transfer Protocol) client
 Name: ftp
 Version: 0.17
-Release: 56%{?dist}
+Release: 57%{?dist}
 License: BSD with advertising
 Group: Applications/Internet
 Source0: ftp://ftp.linux.org.uk/pub/linux/Networking/netkit/netkit-ftp-%{version}.tar.gz
@@ -33,6 +33,7 @@ Patch24: netkit-ftp-0.17-case.patch
 Patch25: netkit-ftp-0.17-chkmalloc.patch
 Patch26: netkit-ftp-0.17-man.patch
 Patch27: netkit-ftp-0.17-acct_ovl.patch
+Patch28: netkit-ftp-0.17-remove-nested-include.patch
 
 BuildRequires: glibc-devel, readline-devel, ncurses-devel
 
@@ -73,6 +74,7 @@ file transfers.
 %patch25 -p1 -b .chkmalloc
 %patch26 -p1 -b .man
 %patch27 -p1 -b .acct_ovl
+%patch28 -p1
 
 %build
 sh configure --with-c-compiler=gcc --enable-ipv6
@@ -105,6 +107,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man5/netrc.*
 
 %changelog
+* Fri Jul 20 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-57
+- Remove nested include (fix compilation in rawhide)
+
 * Thu Jul 19 2012 Jan Synáček <jsynacek@redhat.com> - 0.17-56
 - Fixed Source0 and URL
 - Make spec fedora-review-friendly
diff --git a/netkit-ftp-0.17-remove-nested-include.patch b/netkit-ftp-0.17-remove-nested-include.patch
new file mode 100644
index 0000000..97cf136
--- /dev/null
+++ b/netkit-ftp-0.17-remove-nested-include.patch
@@ -0,0 +1,18 @@
+--- netkit-ftp-0.17/ftp/ftp.c	2012-07-20 07:55:48.545151322 +0200
++++ netkit-ftp-0.17-new/ftp/ftp.c	2012-07-20 08:05:07.941468914 +0200
+@@ -74,6 +74,7 @@ char ftp_rcsid[] =
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/file.h>
++#include <sys/poll.h>
+ 
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+@@ -820,7 +821,6 @@ sendrequest(const char *cmd, char *local
+ 	/* It can be later removed.                              */
+ 	if (old_code_l == 150 && code == 150 && cpend == 1
+ 	    && sunique == 1 && cin !=  NULL && fileno (cin) >=  0 ) {
+-		#include <sys/poll.h>
+ 		struct pollfd  fds_events_l [2] ;
+ 		int rc;
+