[kdelibs: 4/4] Merge branch 'f20', for arm fix

[Rex Dieter]

commit 4c8d507f2dd7c4ae4475b2896148863de2ba2f3a
Merge: 3de5298 b934cf8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 2 10:53:38 2013 -0600

    Merge branch 'f20', for arm fix
    
    Conflicts:
    	kdelibs.spec

 kdelibs-4.11.3-arm.patch |   13 +++++++++++++
 kdelibs.spec             |   11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --cc kdelibs.spec
index 0dde315,b143d1b..b755a06
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@@ -36,8 -36,8 +36,8 @@@
  %global _changelog_trimtime %(date +%s -d "1 year ago")
  
  Summary: KDE Libraries
 -Version: 4.11.3
 +Version: 4.11.97
- Release: 1%{?dist}
+ Release: 2%{?dist}
  
  Name: kdelibs
  Epoch: 6
@@@ -604,18 -611,9 +610,21 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
 -* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.3-2
++* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.97-2
+ - add workaround for bz#969524
+ 
 +* Sun Dec 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.97-1
 +- 4.11.97
 +
 +* Wed Nov 27 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.11.95-2
 +- rebuild (openexr)
 +
 +* Thu Nov 21 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.95-1
 +- 4.11.95
 +
 +* Fri Nov 15 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.90-1
 +- 4.11.90
 +
  * Fri Nov 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.3-1
  - 4.11.3