[geome/f17] * Thu Oct 25 2012 Paul Wouters <pwouters at redhat.com> - 1.2-1 - Update to 1.2, which splits library a

[Paul Wouters]

commit 7fd4a506f0adfb5e42dad6fd27871e1952623bf8
Author: Paul Wouters <paul at nohats.ca>
Date:   Thu Oct 25 18:46:34 2012 -0400

    * Thu Oct 25 2012 Paul Wouters <pwouters at redhat.com> - 1.2-1
    - Update to 1.2, which splits library and command tool
    - Remove dependancy on python-simplejson

 .gitignore |    1 +
 geome.spec |   36 ++++++++++++++++++++++++++----------
 sources    |    1 +
 3 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 750949d..45b4f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /geome-1.1.tar.gz
+/geome-1.2.tar.gz
diff --git a/geome.spec b/geome.spec
index 0a8aa42..1080834 100644
--- a/geome.spec
+++ b/geome.spec
@@ -1,13 +1,15 @@
-Summary: Obtain your geolocation data from Google using NetworkManager
+Summary: Obtain your geo-location data from Google using NetworkManager
 Name: geome
-Version: 1.1
-Release: 3%{?dist}
+Version: 1.2
+Release: 1%{?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
-Requires: dbus-python python-simplejson
+BuildRequires: python-setuptools-devel, python2-devel
+Requires: dbus-python
+Requires: python-geome
 
 %description
 geome queries NetworkManager for its wifi information, such as ESSID's
@@ -17,24 +19,38 @@ It can return all of the information Google returns, or with the -s
 flag, only return the latitude/longitude. This last mode is used by
 the Pidgin OTR nearby friends plugin.
 
+%package -n python-geome
+Summary: Python library for geome location
+Group: Applications/System
+
+%description -n python-geome
+Geome python module with the geome.location() function
+
 %prep
 %setup -q 
 
 %build
 
 %install
-mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1
-
+{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_mandir}/man1 %{buildroot}/%{python_sitelib}
+install -p -m 0644 src/geome.py %{buildroot}%{python_sitelib}
 install -p -m 0755 geome %{buildroot}%{_bindir}
 install -p -m 644 geome.1 %{buildroot}%{_mandir}/man1
-gzip %{buildroot}%{_mandir}/man1/geome.1
 
-%files 
+%files -n python-geome
 %doc README COPYING
+%{python_sitelib}/*
+
+%files
 %{_bindir}/geome
 %{_mandir}/man1/geome.1*
 
 %changelog
+* Thu Oct 25 2012 Paul Wouters <pwouters at redhat.com> - 1.2-1
+- Update to 1.2, which splits library and command tool in subpackage
+- Remove dependancy on python-simplejson
+
 * Tue Apr 10 2012 Paul Wouters <pwouters at redhat.com> - 1.1-3
 - Removed python-argparse which is folderd into python
   on Fedora (not EL)
diff --git a/sources b/sources
index 47acf3d..12d6585 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 9c125ec0a3ca0fc7771103ad0c6cfb69  geome-1.1.tar.gz
+f5992e9efb3e541a3fefa067c01c3687  geome-1.2.tar.gz