[kdelibs: 9/9] autostart debugging bits, increase klauncher timeout (possible fix for #983110)

Rex Dieter rdieter at fedoraproject.org
Sat Dec 7 03:57:14 UTC 2013


commit 48ec2a943424715e2b67dc472385abaf943fb243
Merge: 886ee57 a03bbb6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 6 21:57:05 2013 -0600

    autostart debugging bits, increase klauncher timeout (possible fix for #983110)
    
    merge recent commits to f20 branch

 kdelibs-4.11.3-autostart-debug.patch   |  120 ++++++++++++++++++++++++++++++++
 kdelibs-4.11.3-klauncher-timeout.patch |   12 +++
 kdelibs.spec                           |   30 ++++++++-
 3 files changed, 161 insertions(+), 1 deletions(-)
---
diff --cc kdelibs.spec
index 421365f,c3f955e..aa36c6c
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@@ -25,6 -25,8 +25,8 @@@
  %define cmake_pkg cmake
  %define upower 1
  %endif
+ # enable tests (disabled by default)
 -#global tests 1
++%global tests 1
  
  %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
  %global shared_desktop_ontologies_version %(pkg-config --modversion shared-desktop-ontologies 2>/dev/null || echo %{shared_desktop_ontologies_ver})
@@@ -36,8 -38,8 +38,8 @@@
  %global _changelog_trimtime %(date +%s -d "1 year ago")
  
  Summary: KDE Libraries
 -Version: 4.11.3
 -Release: 6%{?dist}
 +Version: 4.11.97
- Release: 3%{?dist}
++Release: 4%{?dist}
  
  Name: kdelibs
  Epoch: 6
@@@ -608,24 -633,22 +633,27 @@@ gtk-update-icon-cache %{_kde4_iconsdir}
  
  
  %changelog
 -* 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
  


More information about the scm-commits mailing list