Merge branch 'master' into f20

Conflicts: wavemon.spec
remove -n
2014-09-30 19:26:35 +02:00 · 2014-03-11 13:58:06 +01:00 · 2014-03-11 13:57:04 +01:00
3 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@ wavemon-0.6.11.tar.bz2
 /wavemon-0.7.4.tar.bz2
 /wavemon-0.7.5.tar.bz2
 /wavemon-0.7.6.tar.bz2
 /v0.7.6.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-c60e25feb8b1785cf14371556f0613f4  wavemon-0.7.6.tar.bz2
+cd0049f174745d32b4fdf3b63d897bad  v0.7.6.tar.gz
--- a/wavemon.spec
+++ b/wavemon.spec
@ -4,8 +4,8 @@ Release:        4%{?dist}
 Summary:        Ncurses-based monitoring application for wireless network devices
 License:        GPLv2+
-URL:            http://eden-feed.erg.abdn.ac.uk/wavemon/
+URL:            http://www.erg.abdn.ac.uk/wavemon/
-Source0:        http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/%{name}-%{version}.tar.bz2
+Source0:        https://github.com/uoaerg/wavemon/archive/v%{version}.tar.gz
 BuildRequires:  ncurses-devel
 BuildRequires:  libpcap-devel
Author	SHA1	Message	Date
Fabian Affolter	ddb461f746	Merge branch 'master' into f20 Conflicts: wavemon.spec	2014-09-30 19:26:35 +02:00
Fabian Affolter	837508c16e	remove -n	2014-03-11 13:58:06 +01:00
Fabian Affolter	5031be53ca	* Tue Mar 11 2014 Fabian Affolter <mail@fabian-affolter.ch> - 0.7.6-2 - Update SOURCE url	2014-03-11 13:57:04 +01:00