[qt-creator/f19: 6/6] Merge branch 'f20' into f19

[Sandro Mani]

commit 733973cfeeb2f6f2322a02bc2c8f847766a1b29f
Merge: b804206 511a987
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed Mar 12 21:07:35 2014 +0100

    Merge branch 'f20' into f19

 qt-creator.spec       |   17 ++++++++++++-----
 qtcreator.appdata.xml |   28 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
---
diff --cc qt-creator.spec
index 1339fe3,0193add..4f838b3
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@@ -29,7 -30,9 +30,8 @@@ BuildRequires:  qt4-webkit-deve
  # for QmlDesigner, see also https://bugzilla.redhat.com/show_bug.cgi?id=657498
  BuildRequires:  qt4-devel-private
  BuildRequires:  desktop-file-utils
 -BuildRequires:  botan-devel
  BuildRequires:  diffutils
+ BuildRequires:  appdata-tools
  
  # long list of private shared lib names to filter out
  %include %{SOURCE2}