[wavemon/f20: 4/4] Merge branch 'master' into f20

[Fabian Affolter]

commit ddb461f7460099ec6608f1c5eacf70b1f94f5aff
Merge: 837508c 2de26e5
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Tue Sep 30 19:26:35 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	wavemon.spec

 wavemon.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc wavemon.spec
index c5f2e5f,0dcf8f6..caa3da8
--- a/wavemon.spec
+++ b/wavemon.spec
@@@ -4,11 -4,11 +4,11 @@@ Release:        4%{?dist
  Summary:        Ncurses-based monitoring application for wireless network devices
  
  License:        GPLv2+
 -URL:            http://eden-feed.erg.abdn.ac.uk/wavemon/
 -Source0:        http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/%{name}-%{version}.tar.bz2
 +URL:            http://www.erg.abdn.ac.uk/wavemon/
 +Source0:        https://github.com/uoaerg/wavemon/archive/v%{version}.tar.gz
  
  BuildRequires:  ncurses-devel
- Requires:       wireless-tools
+ BuildRequires:  libpcap-devel
  
  %description
  wavemon is a wireless device monitoring application that allows you to