rpms/gftp/devel gftp-stropts.patch,NONE,1.1 gftp.spec,1.30,1.31

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/gftp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20135

Modified Files:
	gftp.spec 
Added Files:
	gftp-stropts.patch 
Log Message:
* Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> - 2:2.0.18-3
- stropts.h was removed from glibc; don't #include it anymore


gftp-stropts.patch:

--- NEW FILE gftp-stropts.patch ---
diff -up gftp-2.0.18/lib/pty.c.stropts gftp-2.0.18/lib/pty.c
--- gftp-2.0.18/lib/pty.c.stropts	2008-04-02 16:22:00.000000000 -0400
+++ gftp-2.0.18/lib/pty.c	2008-04-02 16:22:45.000000000 -0400
@@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char 
 
 #elif HAVE_GRANTPT
 
-#ifndef __FreeBSD__
-#include <stropts.h>
-#endif
-
 char *
 gftp_get_pty_impl (void)
 {


Index: gftp.spec
===================================================================
RCS file: /cvs/extras/rpms/gftp/devel/gftp.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gftp.spec	17 Feb 2008 00:31:39 -0000	1.30
+++ gftp.spec	2 Apr 2008 20:30:42 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: A multi-threaded FTP client for the X Window System
 Name: gftp
 Version: 2.0.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 2
 License: GPLv2+
 Group: Applications/Internet
@@ -10,6 +10,7 @@
 Source1: gftp-text-disabled.sh
 Patch0: gftp-2.0.18-thread-initialization.patch
 Patch1: gftp-2.0.18-user-dirs.patch
+Patch2: gftp-stropts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gtk2-devel >= 2.2.0
 BuildRequires: readline-devel
@@ -31,6 +32,7 @@
 %setup -q
 %patch0 -p1 -b .thread-initialization
 %patch1 -p1 -b .user-dirs
+%patch2 -p1 -b .stropts
 
 %build
 
@@ -78,6 +80,9 @@
 %{_mandir}/man1/gftp.1.gz
 
 %changelog
+* Wed Apr  2 2008 Christopher Aillon <caillon at redhat.com> - 2:2.0.18-3
+- stropts.h was removed from glibc; don't #include it anymore
+
 * Sat Feb 16 2008 Christopher Aillon <caillon at redhat.com> - 2:2.0.18-2
 - Fix merge review comments