- no more separated libtinfo(w)

Changed files:
    ettercap-ncurses.patch -> 1.10
    ettercap.spec -> 1.75

diff --git a/ettercap-ncurses.patch b/ettercap-ncurses.patch
deleted file mode 100644 (file)
index c42e635..0000000
--- a/ettercap-ncurses.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- ettercap-NG-0.7.3/configure.in~    2010-06-19 15:46:50.853044834 +0200
-+++ ettercap-NG-0.7.3/configure.in     2010-06-19 15:49:05.153040338 +0200
-@@ -676,7 +676,7 @@
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
-         NCURSINC="-I$withval"
--        NCURSLIB="-L$withval -lpanel -lmenu -lform -lncurses"
-+        NCURSLIB="-L$withval -lpanel -lmenu -lform -lncurses -ltinfo"
-         AC_DEFINE(HAVE_NCURSES, 1)
-         AM_CONDITIONAL(NCURSES, true)
-         ac_ec_libncurses=$withval
-@@ -688,7 +688,7 @@
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
-         NCURSINC="-I$withval/include"
--        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses"
-+        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses -ltinfo"
-         AC_DEFINE(HAVE_NCURSES, 1)
-         AM_CONDITIONAL(NCURSES, true)
-         ac_ec_libncurses=$withval
-@@ -700,7 +700,7 @@
-         owd=`pwd`
-         if cd $withval; then withval=`pwd`; cd $owd; fi
-         NCURSINC="-I$withval/include/ncurses"
--        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses"
-+        NCURSLIB="-L$withval/lib -lpanel -lmenu -lform -lncurses -ltinfo"
-         AC_DEFINE(HAVE_NCURSES, 1)
-         AM_CONDITIONAL(NCURSES, true)
-         ac_ec_libncurses=$withval
-@@ -718,7 +718,7 @@
-          AC_MSG_RESULT(no)
-      else 
-          NCURSINC="-I/usr/include/ncurses"
--         NCURSLIB="-lpanel -lmenu -lform -lncurses"
-+         NCURSLIB="-lpanel -lmenu -lform -lncurses -ltinfo"
-          AC_DEFINE(HAVE_NCURSES, 1)
-          AM_CONDITIONAL(NCURSES, true)
-          ac_ec_libncurses=default
-@@ -730,7 +730,7 @@
-                -a -f /usr/include/panel.h; then
-          AC_MSG_RESULT(no)
-      else 
--         NCURSLIB="-lpanel -lmenu -lform -lncurses"
-+         NCURSLIB="-lpanel -lmenu -lform -lncurses -ltinfo"
-          AC_DEFINE(HAVE_NCURSES, 1)
-          AM_CONDITIONAL(NCURSES, true)
-          ac_ec_libncurses=default

diff --git a/ettercap.spec b/ettercap.spec
index 4f5905731f50f30a33c5fc6216c7a6b6f06c569e..88db82721c143a8ed12779f0c3dad1c38127798c 100644 (file)
--- a/ettercap.spec
+++ b/ettercap.spec
@@ -15,10 +15,9 @@ Source0:     http://downloads.sourceforge.net/ettercap/%{name}-NG-%{version}.tar.gz
 # Source0-md5: 28fb15cd024162c55249888fe1b97820
 Patch1:                %{name}-build.patch
 Patch2:                %{name}-as-needed.patch
-Patch3:                %{name}-ncurses.patch
-Patch4:                %{name}-libmissing.patch
-Patch5:                %{name}-shlib_ext.patch
-Patch6:                %{name}-flags.patch
+Patch3:                %{name}-libmissing.patch
+Patch4:                %{name}-shlib_ext.patch
+Patch5:                %{name}-flags.patch
 URL:           http://ettercap.sourceforge.net/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -86,7 +85,6 @@ hosts na rede local, portas abertas, versão de serviços, tipo de host
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}