4.6.3
This commit is contained in:
parent
c3a66745e1
commit
b81bb33cb2
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/kdelibs-4.6.2.tar.bz2
|
/kdelibs-4.6.2.tar.bz2
|
||||||
|
/kdelibs-4.6.3.tar.bz2
|
||||||
|
@ -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 {
|
|
10
kdelibs.spec
10
kdelibs.spec
@ -15,8 +15,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.6.2
|
Version: 4.6.3
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -94,8 +94,6 @@ Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
|||||||
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
Patch51: kdelibs-4.6.2-uri_mimetypes.patch
|
||||||
|
|
||||||
## upstream
|
## upstream
|
||||||
# https://projects.kde.org/projects/kde/kdelibs/repository/revisions/72cbad117d0abb4b47a5d00754ea465eda6c06b5
|
|
||||||
Patch100: kdelibs-4.6.2-kde270538.patch
|
|
||||||
|
|
||||||
## security fix
|
## security fix
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# 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
|
%patch51 -p1 -b .uri_mimetypes
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .kde270538
|
|
||||||
|
|
||||||
# security fix
|
# security fix
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
@ -537,6 +534,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Mon Apr 25 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.2-3
|
||||||
- Adjust uri/ mimetypes to use newer x-scheme-handler/ (#587573)
|
- Adjust uri/ mimetypes to use newer x-scheme-handler/ (#587573)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user