rpms/kdebase/F-8 kdebase-3.5.10-minicli-decimal-comma.patch, NONE, 1.1 kdebase.spec, 1.299, 1.300

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26912/F-8

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.10-minicli-decimal-comma.patch 
Log Message:
* Wed Oct 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2.1
- add upstream patch to support decimal comma in the minicli calculator

kdebase-3.5.10-minicli-decimal-comma.patch:

--- NEW FILE kdebase-3.5.10-minicli-decimal-comma.patch ---
diff -ur kdebase-3.5.10/kdesktop/minicli.cpp kdebase-3.5.10-minicli-decimal-comma/kdesktop/minicli.cpp
--- kdebase-3.5.10/kdesktop/minicli.cpp	2007-01-15 12:32:10.000000000 +0100
+++ kdebase-3.5.10-minicli-decimal-comma/kdesktop/minicli.cpp	2008-10-08 11:49:33.000000000 +0200
@@ -857,9 +857,12 @@
   updateAuthLabel();
 }
 
-QString Minicli::calculate(const QString &exp)
+QString Minicli::calculate(const QString &input)
 {
    QString result, cmd;
+   QString exp = input;
+   //replace commas with dots so european decimals can be calculated
+   exp.replace(QChar(','), ".");
    const QString bc = KStandardDirs::findExe("bc");
    if ( !bc.isEmpty() )
       cmd = QString("echo %1 | %2").arg(KProcess::quote(QString("scale=8; ")+exp), KProcess::quote(bc));


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- kdebase.spec	21 Sep 2008 04:56:46 -0000	1.299
+++ kdebase.spec	8 Oct 2008 09:53:44 -0000	1.300
@@ -14,7 +14,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -87,6 +87,8 @@
 Patch36: kdebase-3.5.9-userdiskmount.patch
 # don't link kcm_colors against libkrdb (and don't call runRdb)
 Patch37: kdebase-3.5.10-libkrdb_dep.patch
+# http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
+Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
 
 # security fixes
 
@@ -319,6 +321,7 @@
 # F9+ only - we do want to runRdb on F8
 %patch37 -p1 -b .libkrdb_dep
 %endif
+%patch100 -p1 -b .minicli-decimal-comma
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -860,6 +863,9 @@
 
 
 %changelog
+* Wed Oct 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2.1
+- add upstream patch to support decimal comma in the minicli calculator
+
 * Sun Sep 21 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 3.5.10-2
 - fix libkrdb_dep patch not to call runRdb which is not being linked in
 - don't apply libkrdb_dep patch on F8-