[viking/f14/master: 16/16] Merge branch 'master' into f14

[Fabian Affolter]

commit 3faf8d2b647dca1c33fe739a87a3533dca5dd266
Merge: 03288b5 a969223
Author: Fabian Affolter <fabian at affolter-engineering.ch>
Date:   Sun Mar 6 14:52:52 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	sources
    	viking.spec

 .gitignore  |    5 +++++
 sources     |    2 +-
 viking.spec |    7 ++++---
 3 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc viking.spec
index 647b23a,9297430..06511cc
--- a/viking.spec
+++ b/viking.spec
@@@ -6,8 -6,7 +6,6 @@@ Summary:        GPS data editor and ana
  Group:          Applications/Productivity
  License:        GPLv2+
  URL:            http://viking.sourceforge.net/
--Source0:        http://downloads.sourceforge.net/viking/viking-%{version}.tar.gz
- #Patch1:		    %{name}-linking.patch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  BuildRequires:  intltool
@@@ -92,6 -91,12 +90,9 @@@ f
  
  
  %changelog
+ * Sun Mar 06 2011 Fabian Affolter <fabian at bernewireless.net> - 1.1-1
+ - Updated to new upstream version 1.1
+ 
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Jan 28 2011 Fabian Affolter <fabian at bernewireless.net> - 1.0.1-1
  - Updated description to fix #673009
  - Updated to new upstream version 1.0.1