[ettercap/f13/master: 10/10] Merge branch 'f14' into f13

[Jon Ciesla]

commit 0812d5304c94d18b4b02a6a789ccd3172811376d
Merge: 9d3d26a 929b0e4
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Oct 28 12:47:51 2010 -0500

    Merge branch 'f14' into f13
    
    Conflicts:
    	ettercap.spec

 ettercap-NG-0.7.3-passive-dns.patch |   49 +++++++++++++++++++++++++++++++++++
 ettercap.spec                       |   13 ++++++++-
 2 files changed, 61 insertions(+), 1 deletions(-)
---
diff --cc ettercap.spec
index 3c32427,bfe7d1c..83826f8
--- a/ettercap.spec
+++ b/ettercap.spec
@@@ -15,6 -15,8 +15,9 @@@ Patch3: ettercap-NG-0.7.3-daemon-textmo
  Patch4: ettercap-NG-0.7.3-mitm-loop.patch
  Patch5: ettercap-NG-0.7.3-selinux-fcntl.patch
  Patch6: ettercap-NG-0.7.3-64bit-crash.patch
+ Patch7: ettercap-NG-0.7.3-passive-dns.patch
+ 
++
  BuildRoot: %{_tmppath}/%{name}-NG-%{version}-%{release}-root%(%{__id_u} -n)
  
  BuildRequires: desktop-file-utils
@@@ -102,8 -106,10 +107,11 @@@ This package contains the GTK version
  %patch4 -p0
  %patch5 -p0
  %patch6 -p0
+ %patch7 -p0
+ 
 +
  %build
+ autoconf
  %configure --enable-gtk
  make %{?_smp_mflags}
  cp src/ettercap src/ettercap-gtk