packages: kde4-kdebase-workspace/kde4-kdebase-workspace.spec, kde4-kdebase-...

[cactus]

Author: cactus                       Date: Tue Aug 25 14:13:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; with upstream patch for system-monitor-hdd applet

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.168 -> 1.169) , kde4-kdebase-workspace-sm_hdd.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.168 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.169
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.168	Wed Aug 19 21:55:08 2009
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Tue Aug 25 16:13:38 2009
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
 Version:	4.3.0
-Release:	5
+Release:	6
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{oname}-%{version}.tar.bz2
@@ -30,6 +30,7 @@
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-rootprivs.patch
 Patch1:		%{name}-kdmconfig.patch
+Patch2:		%{name}-sm_hdd.patch
 URL:		http://www.kde.org/
 BuildRequires:	ConsoleKit-devel
 BuildRequires:	NetworkManager-devel >= 0.7.0-0.svn4027.1
@@ -524,6 +525,8 @@
 %patch100 -p1
 #%patch0 -p1
 %patch1 -p1
+# upstream patch for system-monitor-hdd
+%patch2 -p4
 
 %build
 install -d build
@@ -1621,6 +1624,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.169  2009/08/25 14:13:38  cactus
+- rel 6; with upstream patch for system-monitor-hdd applet
+
 Revision 1.168  2009/08/19 19:55:08  arekm
 - rel 5; branch diff is back
 

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-sm_hdd.patch
diff -u /dev/null packages/kde4-kdebase-workspace/kde4-kdebase-workspace-sm_hdd.patch:1.1
--- /dev/null	Tue Aug 25 16:13:44 2009
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-sm_hdd.patch	Tue Aug 25 16:13:38 2009
@@ -0,0 +1,13 @@
+--- trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.cpp	2009/07/25 22:47:08	1002414
++++ trunk/KDE/kdebase/workspace/plasma/applets/system-monitor/hdd.cpp	2009/08/14 07:50:46	1011262
+@@ -260,8 +260,8 @@
+                             data->value("File System Type").toString() <<
+                             data->value("Size").toString();
+         */
+-        if ((data->value("Usage").toString() != "File System" &&
+-             data->value("Usage").toString() != "Raid") ||
++        if ((data->value("Usage").toString() != i18n("File System") &&
++             data->value("Usage").toString() != i18n("Raid")) ||
+             data->value("File System Type").toString() == "swap") {
+             QStringList list = items();
+             list.removeAll(uuid);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.168&r2=1.169&f=u