Merge branch 'f20'

Conflicts:
	kdelibs.spec
This commit is contained in:
Rex Dieter 2013-12-07 13:26:01 -06:00
commit a172f8137a
2 changed files with 5 additions and 2 deletions

View File

@ -114,7 +114,7 @@ diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit
#endif
+ kWarning() << "Completing: " << request->name;
requestDone( request );
+ kWarning() << "Completed: " << request->name;
+ kWarning() << "Completed.";
continue;
}
} while(requestQueue.count());

View File

@ -39,7 +39,7 @@
Summary: KDE Libraries
Version: 4.11.97
Release: 4%{?dist}
Release: 5%{?dist}
Name: kdelibs
Epoch: 6
@ -633,6 +633,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Sat Dec 07 2013 Rex Dieter <rdieter@fedoraproject.org> - 6:4.11.97-5
- avoid possible crasher in autostart-debug.patch
* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.97-4
- autostart debugging bits, increase klauncher timeout (possible fix for #983110)