[tnftp] Link with system libedit rather than using internal one (#1079639)

[David Cantrell]

commit 03bef08d9321db2c0b90c9d9322ff27c05ca7230
Author: David Cantrell <dcantrell at redhat.com>
Date:   Tue Jun 24 15:12:41 2014 -0400

    Link with system libedit rather than using internal one (#1079639)

 tnftp-20130505-autognu.patch |   86 ++++++++++++++++++++++++++++++++++++++++++
 tnftp.spec                   |   15 ++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)
---
diff --git a/tnftp-20130505-autognu.patch b/tnftp-20130505-autognu.patch
new file mode 100644
index 0000000..0328648
--- /dev/null
+++ b/tnftp-20130505-autognu.patch
@@ -0,0 +1,86 @@
+diff -up tnftp-20130505/configure.ac.orig tnftp-20130505/configure.ac
+--- tnftp-20130505/configure.ac.orig	2013-05-05 09:50:50.000000000 -0400
++++ tnftp-20130505/configure.ac	2014-06-24 14:40:08.960747232 -0400
+@@ -13,7 +13,8 @@ AC_REVISION([$Revision: 1.25 $])
+ 
+ AS_SHELL_SANITIZE()
+ 
+-AC_CONFIG_SRCDIR([tnftp.h])
++AC_CONFIG_SRCDIR([src/ftp.c])
++AC_CONFIG_HEADER([tnftp.h])
+ AC_CONFIG_AUX_DIR([buildaux])
+ AC_CONFIG_MACRO_DIR([buildaux])
+ AC_CONFIG_HEADERS([tnftp_config.h])
+@@ -71,6 +72,7 @@ AH_TEMPLATE([WITH_SSL],
+ #
+ # Checks for programs.
+ #
++AM_PROG_AR()
+ AC_PROG_CC()
+ AC_PROG_AWK()
+ AC_PROG_LIBTOOL()
+@@ -420,8 +422,6 @@ AM_CONDITIONAL([USE_LIBEDIT], [test "$op
+ #
+ AC_CONFIG_FILES([
+         Makefile
+-        libedit/Makefile
+-        libedit/makelist
+         libnetbsd/Makefile
+         src/Makefile
+ ])
+diff -up tnftp-20130505/libnetbsd/Makefile.am.orig tnftp-20130505/libnetbsd/Makefile.am
+--- tnftp-20130505/libnetbsd/Makefile.am.orig	2010-01-04 01:24:20.000000000 -0500
++++ tnftp-20130505/libnetbsd/Makefile.am	2014-06-24 13:47:17.453747232 -0400
+@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la
+ libnetbsd_la_SOURCES =
+ 
+ 
+-CPPFLAGS = \
++AM_CPPFLAGS = \
+ 	-I$(srcdir) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_builddir)
+diff -up tnftp-20130505/Makefile.am.orig tnftp-20130505/Makefile.am
+--- tnftp-20130505/Makefile.am.orig	2013-05-05 09:06:37.000000000 -0400
++++ tnftp-20130505/Makefile.am	2014-06-24 13:48:39.013747232 -0400
+@@ -4,10 +4,6 @@ ACLOCAL_AMFLAGS = -I buildaux
+ 
+ SUBDIRS = libnetbsd
+ 
+-if USE_LIBEDIT
+-SUBDIRS += libedit
+-endif
+-
+ SUBDIRS += src
+ 
+ EXTRA_DIST = \
+diff -up tnftp-20130505/src/Makefile.am.orig tnftp-20130505/src/Makefile.am
+--- tnftp-20130505/src/Makefile.am.orig	2013-05-05 09:29:19.000000000 -0400
++++ tnftp-20130505/src/Makefile.am	2014-06-24 13:46:27.342747232 -0400
+@@ -14,7 +14,7 @@ tnftp_SOURCES = \
+ 	ruserpass.c \
+ 	util.c
+ 
+-tnftp_CPPFLAGS = \
++tnftp_AM_CPPFLAGS = \
+ 	-DHAVE_TNFTPD_H=1 \
+ 	-D_DEFAULT_CONFDIR=\"${sysconfdir}\" \
+ 	-I$(srcdir) \
+@@ -27,7 +27,7 @@ tnftp_LDADD = \
+ 
+ 
+ if USE_LIBEDIT
+-tnftp_CPPFLAGS += \
++tnftp_AM_CPPFLAGS += \
+ 	-I$(top_srcdir)/libedit
+ 
+ tnftp_LDADD += \
+@@ -39,7 +39,7 @@ if WITH_SSL
+ tnftp_SOURCES += \
+ 	ssl.c
+ 
+-tnftp_CPPFLAGS += \
++tnftp_AM_CPPFLAGS += \
+ 	$(OPENSSL_INCLUDES)
+ 
+ tnftp_LDADD += \
diff --git a/tnftp.spec b/tnftp.spec
index 2645367..615bee4 100644
--- a/tnftp.spec
+++ b/tnftp.spec
@@ -1,6 +1,6 @@
 Name:          tnftp
 Version:       20130505
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       FTP (File Transfer Protocol) client from NetBSD
 
 Group:         Applications/Internet
@@ -11,8 +11,11 @@ License:       BSD and ISC
 URL:           http://www.NetBSD.org/
 Source0:       ftp://ftp.netbsd.org/pub/NetBSD/misc/%{name}/%{name}-%{version}.tar.gz
 
-BuildRequires: ncurses-devel
+Patch0:        tnftp-20130505-autognu.patch
+
+BuildRequires: libedit-devel
 BuildRequires: openssl-devel
+BuildRequires: autoconf
 
 %description
 %{name} is the FTP (File Transfer Protocol) client from NetBSD.  FTP is a widely
@@ -24,6 +27,11 @@ formerly called lukemftp.
 %prep
 %setup -q
 
+# remove libedit and patch autognu files
+rm -rf libedit
+%patch0 -p1
+autoreconf -i
+
 %build
 %configure --enable-editcomplete \
            --enable-ipv6 \
@@ -39,6 +47,9 @@ make install DESTDIR=%{buildroot}
 %{_mandir}/man1/%{name}.1.gz
 
 %changelog
+* Tue Jun 24 2014 David Cantrell <dcantrell at redhat.com> - 20130505-7
+- Link with system libedit rather than using internal one (#1079639)
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20130505-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild