diff --git a/gftp-stropts.patch b/gftp-stropts.patch new file mode 100644 index 0000000..b99d725 --- /dev/null +++ b/gftp-stropts.patch @@ -0,0 +1,14 @@ +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 +-#endif +- + char * + gftp_get_pty_impl (void) + { diff --git a/gftp.spec b/gftp.spec index d63dc3b..9fb84cc 100644 --- a/gftp.spec +++ b/gftp.spec @@ -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 @@ Source0: http://gftp.seul.org/%{name}-%{version}.tar.bz2 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 @@ Install gftp if you need a graphical FTP client. %setup -q %patch0 -p1 -b .thread-initialization %patch1 -p1 -b .user-dirs +%patch2 -p1 -b .stropts %build @@ -78,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/gftp.1.gz %changelog +* Wed Apr 2 2008 Christopher Aillon - 2:2.0.18-3 +- stropts.h was removed from glibc; don't #include it anymore + * Sat Feb 16 2008 Christopher Aillon - 2:2.0.18-2 - Fix merge review comments