- no more separated libtinfo(w)

Changed files:
    proftpd-link.patch -> 1.5
    proftpd.spec -> 1.287

diff --git a/proftpd-link.patch b/proftpd-link.patch
deleted file mode 100644 (file)
index e37be8b..0000000
--- a/proftpd-link.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- proftpd-1.3.2e/configure.in~       2010-08-29 19:11:41.077617756 +0200
-+++ proftpd-1.3.2e/configure.in        2010-08-29 19:14:28.683856499 +0200
-@@ -1765,7 +1765,7 @@
- dnl headers have been found.
- if test x"$ac_cv_header_curses_h" = xyes; then
-   AC_CHECK_LIB(curses, initscr,
--    [ CURSES_LIBS="-lcurses"
-+    [ CURSES_LIBS="-lcurses -ltinfo"
-       AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have curses])
-     ])
- fi
-@@ -1778,19 +1778,19 @@
- 
-   if test x"$enable_nls" = xyes ; then
-     AC_CHECK_LIB(ncursesw, initscr,
--      [ CURSES_LIBS="-lncursesw"
-+      [ CURSES_LIBS="-lncursesw -ltinfow"
-         pr_have_ncursesw="yes"
-         AC_DEFINE(HAVE_LIBNCURSESW, 1, [Define if you have ncursesw])
-       ], [
-         AC_CHECK_LIB(ncurses, initscr,
--          [ CURSES_LIBS="-lncurses"
-+          [ CURSES_LIBS="-lncurses -ltinfo"
-             AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have ncurses])
-           ])
-       ])
- 
-   else 
-     AC_CHECK_LIB(ncurses, initscr,
--      [ CURSES_LIBS="-lncurses"
-+      [ CURSES_LIBS="-lncurses -ltinfo"
-         AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have ncurses])
-       ])
-   fi

diff --git a/proftpd.spec b/proftpd.spec
index 40e51b97b869f1efedfe5b573c691e3334b8629a..2c19f208f9a4b24bb6c4eda44ffe283069cf0847 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -47,7 +47,6 @@ Patch0:               %{name}-paths.patch
 Patch1:                %{name}-noautopriv.patch
 Patch2:                %{name}-wtmp.patch
 Patch3:                %{name}-pool.patch
-Patch4:                %{name}-link.patch
 URL:           http://www.proftpd.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -447,7 +446,6 @@ dodaje hosty do pliku /etc/hosts.deny.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 # mod_clamav
 patch -p0 < mod_clamav-%{mod_clamav_version}/proftpd.patch