[kdelibs: 2/2] Merge commit 'cf152dc1fcec80efe2d292afe7b79463c917c9ea'

[Rex Dieter]

commit 886ee5788543fe7da7ac04f3d04e0fc0e1d1cced
Merge: 4c8d507 cf152dc
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Dec 3 08:45:32 2013 -0600

    Merge commit 'cf152dc1fcec80efe2d292afe7b79463c917c9ea'
    
    Conflicts:
    	kdelibs.spec

 kdelibs-4.11.3-arm.patch |   10 ++++++----
 kdelibs.spec             |    7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --cc kdelibs.spec
index b755a06,41696c5..421365f
--- 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: 2%{?dist}
+ Release: 3%{?dist}
  
  Name: kdelibs
  Epoch: 6
@@@ -610,21 -609,12 +608,24 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
 -* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.3-3
++* Mon Dec 02 2013 Than Ngo <than at redhat.com> - 6:4.11.97-3
+ - add the arm's check in kdelibs
+ 
 -* 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