rpms/kdebase-workspace/F-12 kdebase-workspace-4.4.2-qt47.patch, NONE, 1.1 .cvsignore, 1.44, 1.45 kdebase-workspace.spec, 1.332, 1.333 sources, 1.53, 1.54

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13050

Modified Files:
	.cvsignore kdebase-workspace.spec sources 
Added Files:
	kdebase-workspace-4.4.2-qt47.patch 
Log Message:
* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
- 4.4.2


kdebase-workspace-4.4.2-qt47.patch:
 plasma/generic/applets/battery/battery.cpp     |    1 -
 plasma/generic/applets/digital-clock/clock.cpp |    1 -
 solid/networkmanager-0.7/accesspoint.cpp       |    2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE kdebase-workspace-4.4.2-qt47.patch ---
diff -up kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp.qt47 kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp
--- kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp.qt47	2010-04-01 09:57:43.408591788 -0500
+++ kdebase-workspace-4.4.2/plasma/generic/applets/battery/battery.cpp	2010-04-01 09:57:43.415591144 -0500
@@ -84,7 +84,6 @@ Battery::Battery(QObject *parent, const 
       m_hours(0),
       m_theme(0),
       m_availableProfiles(QStringList()),
-      m_currentProfile(0),
       m_numOfBattery(0),
       m_acAdapterPlugged(false),
       m_remainingMSecs(0),
diff -up kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp.qt47 kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp
--- kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp.qt47	2010-02-26 12:31:57.000000000 -0600
+++ kdebase-workspace-4.4.2/plasma/generic/applets/digital-clock/clock.cpp	2010-04-01 09:58:23.726354288 -0500
@@ -54,7 +54,6 @@ Clock::Clock(QObject *parent, const QVar
       m_showSeconds(false),
       m_showTimezone(false),
       m_dateTimezoneBesides(false),
-      m_dateString(0),
       m_layout(0)
 {
     KGlobal::locale()->insertCatalog("libplasmaclock");
diff -up kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp.qt47 kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp
--- kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp.qt47	2009-08-12 04:59:33.000000000 -0500
+++ kdebase-workspace-4.4.2/solid/networkmanager-0.7/accesspoint.cpp	2010-04-01 09:57:43.415591144 -0500
@@ -29,7 +29,7 @@ along with this program.  If not, see <h
 class NMAccessPoint::Private
 {
 public:
-    Private( const QString & path ) : iface( NMNetworkManager::DBUS_SERVICE, path, QDBusConnection::systemBus()), capabilities(0), wpaFlags(0), rsnFlags(0), frequency(0), hardwareAddress(0), maxBitRate(0), mode((Solid::Control::WirelessNetworkInterface::OperationMode)0), signalStrength(0)
+    Private( const QString & path ) : iface( NMNetworkManager::DBUS_SERVICE, path, QDBusConnection::systemBus()), capabilities(0), wpaFlags(0), rsnFlags(0), frequency(0), maxBitRate(0), mode((Solid::Control::WirelessNetworkInterface::OperationMode)0), signalStrength(0)
     {
     }
     OrgFreedesktopNetworkManagerAccessPointInterface iface;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- .cvsignore	1 Mar 2010 17:19:43 -0000	1.44
+++ .cvsignore	3 Apr 2010 11:30:12 -0000	1.45
@@ -1 +1 @@
-kdebase-workspace-4.4.1.tar.bz2
+kdebase-workspace-4.4.2.tar.bz2


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.332
retrieving revision 1.333
diff -u -p -r1.332 -r1.333
--- kdebase-workspace.spec	11 Mar 2010 12:33:31 -0000	1.332
+++ kdebase-workspace.spec	3 Apr 2010 11:30:12 -0000	1.333
@@ -21,8 +21,8 @@
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.4.1
-Release: 2%{?dist}
+Version: 4.4.2
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -71,9 +71,7 @@ Patch50: kdebase-workspace-4.3.3-kde#171
 Patch51: kdebase-workspace-4.3.95-brightness_keys.patch
 
 # 4.4 patches
-# fix KSysGuard and the KRunner System Activity dialog not refreshing
-# https://bugs.kde.org/show_bug.cgi?id=230187
-Patch100: kdebase-workspace-4.4.1-ksysguard-kde#230187.patch
+Patch100: kdebase-workspace-4.4.2-qt47.patch
 
 # 4.5 patches
 
@@ -333,7 +331,8 @@ Requires: akonadi
 # kubuntu patches
 %patch51 -p1 -b .brightness_keys
 # 4.4 patches
-%patch100 -p0 -b .ksysguard-kde#230187
+%patch100 -p1 -b .qt47
+
 
 %build
 
@@ -509,7 +508,7 @@ fi
 %{_kde4_docdir}/HTML/en/kmenuedit/
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_docdir}/HTML/en/kxkb/
-%{_kde4_docdir}/HTML/en/plasma/
+%{_kde4_docdir}/HTML/en/plasma-desktop/
 %{_kde4_docdir}/HTML/en/systemsettings/
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
@@ -685,6 +684,9 @@ fi
 
 
 %changelog
+* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
+- 4.4.2
+
 * Thu Mar 11 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.1-2
 - fix KSysGuard and KRunner System Activity dialog not refreshing (kde#230187)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/sources,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- sources	1 Mar 2010 17:19:43 -0000	1.53
+++ sources	3 Apr 2010 11:30:13 -0000	1.54
@@ -1 +1 @@
-c5a5826ce0e8b0faa760971850b29111  kdebase-workspace-4.4.1.tar.bz2
+6251e5d0060bd1529f90b9eaf5f84230  kdebase-workspace-4.4.2.tar.bz2