[kde-settings/f16] backport relevant fixes from F17

[Kevin Kofler]

commit 6bf798fa3b9607f738109916564fb45cf83b0170
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Oct 13 01:51:31 2012 +0200

    backport relevant fixes from F17
    
    * Fri Oct 12 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-15
    - kslideshow.kssrc: include some sane/working defaults (rdieter, kde#182104)
    - fix application/x-rpm mimetype defaults (rdieter)
    - fix default indexing paths in nepomukstrigirc (dvratil, #861129)

 .gitignore        |    1 +
 kde-settings.spec |    7 ++++++-
 sources           |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 682a893..871bbe7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kde-settings-4.6-10.tar.bz2
 /kde-settings-plasma-rpm-20110927.tar.xz
 /kde-settings-4.7-14.tar.xz
+/kde-settings-4.7-15.tar.xz
diff --git a/kde-settings.spec b/kde-settings.spec
index a4a86a7..5e46aa3 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,6 +1,6 @@
 # THIS SPECFILE IS FOR F16 ONLY!
 
-%global rel 14
+%global rel 15
 %global system_kde_theme_ver 15.90
 
 Summary: Config files for kde
@@ -168,6 +168,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 12 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7-15
+- kslideshow.kssrc: include some sane/working defaults (rdieter, kde#182104)
+- fix application/x-rpm mimetype defaults (rdieter)
+- fix default indexing paths in nepomukstrigirc (dvratil, #861129)
+
 * Sat Nov 19 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7-14
 - add explicit apper defaults
 - add script to init $XDG_DATA_HOME (to workaround bug #750423)
diff --git a/sources b/sources
index 011cf65..3227a38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b95eb7c08684cbe0f5718f388fd16b85  kde-settings-4.7-14.tar.xz
+4015707cf97a04757a750b2c05644ea9  kde-settings-4.7-15.tar.xz