[kte-collaborative/f18: 2/2] Merge branch 'master' into f18

[Daniel Vrátil]

commit 1946435aec0e0a005f49fecf90a3650d112be81a
Merge: d03fb99 d28edfc
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Sep 24 15:53:35 2013 +0200

    Merge branch 'master' into f18

 kte-collaborative.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --cc kte-collaborative.spec
index ebfbb44,ffafa7c..91e1482
--- a/kte-collaborative.spec
+++ b/kte-collaborative.spec
@@@ -8,9 -8,8 +8,9 @@@ Summary:        Collaborative text edit
  License:        GPLv2+ and LGPLv2+
  URL:            https://projects.kde.org/projects/playground/network/kte-collaborative
  
- Source0:        http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-%{version}.tar.xz
+ Source0:        http://download.kde.org/unstable/%{name}/%{version}/src/%{name}-v%{version}.tar.xz
  Patch0:         kte-collaborative-versioned-sonames.patch
 +Patch1:         kte-collaborative-fix-kde-410-build.patch
  
  BuildRequires:  cmake
  BuildRequires:  kdelibs-devel