Merge branch 'f20'
Conflicts: kdelibs.spec
This commit is contained in:
commit
a172f8137a
@ -114,7 +114,7 @@ diff -up kdelibs-4.11.3/kinit/klauncher.cpp.autostart-debug kdelibs-4.11.3/kinit
|
|||||||
#endif
|
#endif
|
||||||
+ kWarning() << "Completing: " << request->name;
|
+ kWarning() << "Completing: " << request->name;
|
||||||
requestDone( request );
|
requestDone( request );
|
||||||
+ kWarning() << "Completed: " << request->name;
|
+ kWarning() << "Completed.";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
} while(requestQueue.count());
|
} while(requestQueue.count());
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.11.97
|
Version: 4.11.97
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -633,6 +633,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Dec 06 2013 Rex Dieter <rdieter@fedoraproject.org> 6:4.11.97-4
|
||||||
- autostart debugging bits, increase klauncher timeout (possible fix for #983110)
|
- autostart debugging bits, increase klauncher timeout (possible fix for #983110)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user