rpms/kdebase-workspace/devel kdebase-workspace-4.3.0-networkipv4config.patch, NONE, 1.1 kdebase-workspace.spec, 1.255, 1.256

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22865

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.3.0-networkipv4config.patch 
Log Message:
backport forgotten Solid method impl from the 4.3 branch
(needed for the KDE NM applet)


kdebase-workspace-4.3.0-networkipv4config.patch:
 networkipv4config.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE kdebase-workspace-4.3.0-networkipv4config.patch ---
--- libs/solid/control/networkipv4config.cpp	2009/07/21 20:48:36	1000714
+++ libs/solid/control/networkipv4config.cpp	2009/07/21 20:48:54	1000715
@@ -216,6 +216,11 @@
     return d->domains;
 }
 
+QList<Solid::Control::IPv4Route> Solid::Control::IPv4Config::routes() const
+{
+    return d->routes;
+}
+
 Solid::Control::IPv4Config &Solid::Control::IPv4Config::operator=(const Solid::Control::IPv4Config& other)
 {
     if (this == &other)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -p -r1.255 -r1.256
--- kdebase-workspace.spec	25 Jul 2009 04:26:10 -0000	1.255
+++ kdebase-workspace.spec	27 Jul 2009 13:01:21 -0000	1.256
@@ -4,7 +4,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.98
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -28,6 +28,8 @@ Patch15: kdebase-workspace-4.2.0-kio_sys
 
 # upstream patches:
 # 4.3 branch
+# r1000715, forgotten method impl
+Patch16: kdebase-workspace-4.3.0-networkipv4config.patch
 
 # trunk
 
@@ -218,6 +220,7 @@ Requires: PyKDE4 >= %{version}
 %patch13 -p1 -b .pykde4
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p0 -b .networkipv4config
 
 # upstream patches
 
@@ -503,6 +506,9 @@ fi
 
 
 %changelog
+* Mon Jul 27 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.98-3
+- backport forgotten method impl in Solid from 4.3 branch, r1000715
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.98-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild