[geome/f18: 7/7] Merge branch 'master' into f18

[Paul Wouters]

commit f0e5cc1e3db16af87f94d7a4ba63e6a9b506c8e6
Merge: 12320ae 9ac4022
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sun Oct 6 20:34:27 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	geome.spec
    	sources

 .gitignore |    5 +----
 geome.spec |    6 ++++--
 sources    |    2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 3cd9a75,95656b3..06ebd3b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,4 -1,5 +1,1 @@@
--/geome-1.1.tar.gz
--/geome-1.2.tar.gz
--/geome-1.3.tar.gz
--/geome-1.4.tar.gz
+ /geome-2.0.tar.gz
diff --cc geome.spec
index f6aa585,a8f5008..e38a072
--- a/geome.spec
+++ b/geome.spec
@@@ -48,6 -48,15 +48,9 @@@ install -p -m 644 geome.1 %{buildroot}%
  %{_mandir}/man1/geome.1*
  
  %changelog
+ * Sun Oct 06 2013 Paul Wouters <pwouters at redhat.com> - 2.0-1
+ - Updated to 2.0 - uses new Google API, extended lib functions and cli client
+ 
 -* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
 -* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 -
  * Mon Nov 12 2012 Paul Wouters <pwouters at redhat.com> - 1.4-1
  - Update to 1.4, different exit codes, man page updates
  
@@@ -75,4 -84,4 +78,3 @@@
  
  * Fri Apr 06 2012 Paul Wouters <pwouters at redhat.com> - 1.0-1
  - Initial release and package
--