This commit is contained in:
Rex Dieter 2011-04-28 13:05:15 -05:00
parent c3a66745e1
commit b81bb33cb2
4 changed files with 7 additions and 28 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/kdelibs-4.6.2.tar.bz2
/kdelibs-4.6.3.tar.bz2

View File

@ -1,22 +0,0 @@
commit 72cbad117d0abb4b47a5d00754ea465eda6c06b5
Author: Lamarque V. Souza <lamarque@gmail.com>
Date: Sun Apr 10 18:34:17 2011 -0300
Fix Solid::Networking::status() returning Solid::Networking::Unknown
sometimes.
BUG: 270538
FIXED-IN: 4.6.3
diff --git a/solid/solid/networking.cpp b/solid/solid/networking.cpp
index 6dd6553..02c7714 100644
--- a/solid/solid/networking.cpp
+++ b/solid/solid/networking.cpp
@@ -59,6 +59,7 @@ Solid::Networking::Notifier::Notifier()
void Solid::NetworkingPrivate::initialize()
{
QDBusPendingReply<uint> reply = iface->status();
+ reply.waitForFinished();
if (reply.isValid()) {
netStatus = ( Solid::Networking::Status )reply.value();
} else {

View File

@ -15,8 +15,8 @@
%endif
Summary: KDE Libraries
Version: 4.6.2
Release: 3%{?dist}
Version: 4.6.3
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -94,8 +94,6 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
## upstream
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/72cbad117d0abb4b47a5d00754ea465eda6c06b5
Patch100: kdelibs-4.6.2-kde270538.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -281,7 +279,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch51 -p1 -b .uri_mimetypes
# upstream patches
%patch100 -p1 -b .kde270538
# security fix
%patch200 -p1 -b .CVE-2009-2702
@ -537,6 +534,9 @@ rm -rf %{buildroot}
%changelog
* Thu Apr 28 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.3-1
- 4.6.3
* Mon Apr 25 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.2-3
- Adjust uri/ mimetypes to use newer x-scheme-handler/ (#587573)

View File

@ -1 +1 @@
7439251b812dc520d4e6ed874036412c kdelibs-4.6.2.tar.bz2
923a7e8f89aa504647e14472b24b8c0a kdelibs-4.6.3.tar.bz2