[kdelibs: 2/2] Merge branch 'f20'

[Rex Dieter]

commit 9eb06908f0b77bef5b5f85e5a212ef89f82f4473
Merge: a172f81 35fd72a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 9 08:19:14 2013 -0600

    Merge branch 'f20'
    
    Conflicts:
    	kdelibs.spec

 kdelibs-4.11.3-klauncher-no-glib.patch |   25 +++++++++++++++++++++++++
 kdelibs-4.11.3-klauncher-timeout.patch |   12 ------------
 kdelibs.spec                           |   12 ++++++++----
 3 files changed, 33 insertions(+), 16 deletions(-)
---
diff --cc kdelibs.spec
index d48d539,d101cc5..0ac00d0
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@@ -38,8 -38,8 +38,8 @@@
  %global _changelog_trimtime %(date +%s -d "1 year ago")
  
  Summary: KDE Libraries
 -Version: 4.11.3
 -Release: 8%{?dist}
 +Version: 4.11.97
- Release: 5%{?dist}
++Release: 6%{?dist}
  
  Name: kdelibs
  Epoch: 6
@@@ -633,30 -633,29 +633,34 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
 -* Mon Dec 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.11.3-8
++* Mon Dec 09 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.11.97-6
+ - drop klauncher-timeout patch that did not help
+ - set QT_NO_GLIB in klauncher_main.cpp as a possible fix/workaround for #983110
+ 
 -* Sat Dec 07 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.3-7
 +* Sat Dec 07 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.97-5
  - avoid possible crasher in autostart-debug.patch
  
 -* Sat Dec 07 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.11.3-6
 -- increase KLauncher timeout as a possible fix/workaround for #983110
 +* Fri Dec 06 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.11.97-4
 +- autostart debugging bits, increase klauncher timeout (possible fix for #983110)
  
 -* Fri Dec 06 2013 Rex Dieter <rdieter at fedoraproject.org> - 6:4.11.3-5
 -- respin autostart debuging patch
 -- %%check: support regression tests (default off)
 -
 -* Fri Dec 06 2013 Rex Dieter <rdieter at fedoraproject.org> 6:4.11.3-4
 -- add some autostart debugging
 -
 -* 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