[ettercap/f16: 2/2] Merge branch 'f17' into f16

[Jon Ciesla]

commit bab15a1960d7f489bffcff23352288b67a53cf82
Merge: c896abb 8b08a3d
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Jan 14 11:10:19 2013 -0600

    Merge branch 'f17' into f16
    
    Conflicts:
    	ettercap.spec

 ettercap.spec |   40 ++++++++++++++++++----------------------
 sources       |    2 +-
 2 files changed, 19 insertions(+), 23 deletions(-)
---
diff --cc ettercap.spec
index 0691b5b,cc4ce60..3a1b77e
--- a/ettercap.spec
+++ b/ettercap.spec
@@@ -32,7 -32,7 +32,7 @@@ BuildRequires: libtoo
  BuildRequires: bison
  BuildRequires: flex
  BuildRequires: cmake
- BuildRequires: libcurl-devel
 -BuildRequires: groff-base
++BuildRequires: groff
  #some requirements are available in fedora but not in stock epel
  #build for epel requires libnet which is only available from rpmforge
  %if 0%{?rhel}