[geome/el6: 11/11] Merge branch 'master' into el6

[Paul Wouters]

commit 7755df89c2dd25a980da16da889cf3e224dccb08
Merge: bcc3c4d 4014ba2
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Dec 3 13:02:45 2012 -0500

    Merge branch 'master' into el6
    
    Conflicts:
    	geome.spec

 geome.spec |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)
---
diff --cc geome.spec
index 886e0d0,f6aa585..c1a7b78
--- a/geome.spec
+++ b/geome.spec
@@@ -1,15 -1,17 +1,16 @@@
- Summary: Obtain your geolocation data from Google using NetworkManager
+ Summary: Obtain your geo-location data from Google using NetworkManager
  Name: geome
  Version: 1.4
--Release: 1%{?dist}
++Release: 2%{?dist}
  License: GPLv3
- Url:  http://nohats.ca/%{name}
- Source: http://nohats.ca/%{name}/%{name}-%{version}.tar.gz
+ Url:  http://ftp.nohats.ca/%{name}
+ Source: http://ftp.nohats.ca/%{name}/%{name}-%{version}.tar.gz
  Group: Applications/Internet
  BuildArch: noarch
+ BuildRequires: python-setuptools-devel, python2-devel
 -Requires: dbus-python
 +Requires: dbus-python python-simplejson python-argparse
  Requires: python-geome = %{version}
  
 -
  %description
  geome queries NetworkManager for its wifi information, such as ESSID's
  and signal strength, and sends it to Google Location to obtain your
@@@ -36,6 -48,6 +47,9 @@@ install -p -m 644 geome.1 %{buildroot}%
  %{_mandir}/man1/geome.1*
  
  %changelog
++* Mon Dec  3 2012 Paul Wouters <pwouters at redhat.com> - 1.4-2
++- Properly split library and command tool in subpackage
++
  * Mon Nov 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4-1
  - Update to 1.4, different exit codes, man page updates