[kf5-kwallet/f20: 5/5] Merge branch 'master' into f20

[Daniel Vrátil]

commit bd75895ad3d51512574bf58b27d857e02db46e90
Merge: a4e82a6 80f150b
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Mon Nov 3 13:55:42 2014 +0100

    Merge branch 'master' into f20

 kf5-kwallet.spec |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)
---
diff --cc kf5-kwallet.spec
index f5bf91d,cc7bb2a..6f9f0d2
--- a/kf5-kwallet.spec
+++ b/kf5-kwallet.spec
@@@ -82,12 -85,7 +85,8 @@@ make %{?_smp_mflags} -C %{_target_platf
  
  %install
  %make_install -C %{_target_platform}
 +%find_lang kwalletd5_qt --with-qt --all-name
  
- %post libs -p /sbin/ldconfig
- 
- %postun libs -p /sbin/ldconfig
- 
  
  %files
  %doc COPYING.LIB README.md