rpms/taskjuggler/F-7 taskjuggler-2.4.0-floatpointformat.patch, NONE, 1.1 taskjuggler.spec, 1.10, 1.11
Ondrej Vasik (ovasik)
fedora-extras-commits at redhat.com
Fri Oct 5 13:54:58 UTC 2007
Author: ovasik
Update of /cvs/extras/rpms/taskjuggler/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4358
Modified Files:
taskjuggler.spec
Added Files:
taskjuggler-2.4.0-floatpointformat.patch
Log Message:
Fixed serious bug in floating point formatter(upstream fix)
taskjuggler-2.4.0-floatpointformat.patch:
--- NEW FILE taskjuggler-2.4.0-floatpointformat.patch ---
Written-by: upstream
Reviewed-by: Ondrej Vasik <ovasik redhat com>
diff -urNp taskjuggler-2.4.0.orig/docs/en/ChangeLog.xml taskjuggler-2.4.0/docs/en/ChangeLog.xml
--- taskjuggler-2.4.0.orig/docs/en/ChangeLog.xml 2007-10-05 15:06:06.000000000 +0200
+++ taskjuggler-2.4.0/docs/en/ChangeLog.xml 2007-10-05 15:14:23.000000000 +0200
@@ -1200,6 +1200,9 @@ glibc 2.5.</para></listitem>
<listitem><para>Fixed off-by-one-slot bug for limits on allocations
with multiple resources.</para></listitem>
+<listitem><para>Fixed a serious bug in the floating point formatter.
+Zeros right after the decimal separator were lost.</para></listitem>
+
</itemizedlist></para>
</sect2>
diff -urNp taskjuggler-2.4.0.orig/taskjuggler/RealFormat.cpp taskjuggler-2.4.0/taskjuggler/RealFormat.cpp
--- taskjuggler-2.4.0.orig/taskjuggler/RealFormat.cpp 2007-10-05 15:06:05.000000000 +0200
+++ taskjuggler-2.4.0/taskjuggler/RealFormat.cpp 2007-10-05 15:21:01.000000000 +0200
@@ -58,14 +58,19 @@ RealFormat::format(double val, bool show
{
double v = fabs(val) - abs(static_cast<int>(val));
int fract = static_cast<int>(v * pow(10, fracDigits));
- text += fractionSep + QString("%1").arg(fract);
+ QString fracStr = QString("%1").arg(fract);
+ /* Prepend zeros if fractStr is not fracDigits long */
+ if (fracStr.length() < fracDigits)
+ fracStr = QString().fill('0', fracDigits - fracStr.length()) + fracStr;
+ text += fractionSep + fracStr;
+
/* If showZeroFract is false, we remove all zeros from the right end
* of the text string. */
if (!showZeroFract)
while (text[text.length() - 1] == '0')
text = text.left(text.length() - 1);
/* If we have removed the whole fractional part, we remove the
- * fraction seperator as well. */
+ * fraction separator as well. */
if (text.right(fractionSep.length()) == fractionSep)
text = text.left(text.length() - fractionSep.length());
}
diff -urNp taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmlresourcereport-1-Reference.html taskjuggler-2.4.0/TestSuite/HTML-Reports/htmlresourcereport-1-Reference.html
--- taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmlresourcereport-1-Reference.html 2007-10-05 15:06:05.000000000 +0200
+++ taskjuggler-2.4.0/TestSuite/HTML-Reports/htmlresourcereport-1-Reference.html 2007-10-05 15:09:35.000000000 +0200
@@ -178,7 +178,7 @@
<td style="text-align:right; padding-right:44; font-size:90%; ">60</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -284,7 +284,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">30</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -648,7 +648,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">15</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -982,7 +982,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">15</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -1074,7 +1074,7 @@
<td style="text-align:right; padding-right:28; font-size:90%; ">15</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -1166,7 +1166,7 @@
<td style="text-align:right; padding-right:20; font-size:90%; ">15</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -1258,7 +1258,7 @@
<td style="text-align:right; padding-right:12; font-size:90%; ">15</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -1592,7 +1592,7 @@
<td style="text-align:right; padding-right:44; font-size:90%; ">30</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
diff -urNp taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmlresourcereport-2-Reference.html taskjuggler-2.4.0/TestSuite/HTML-Reports/htmlresourcereport-2-Reference.html
--- taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmlresourcereport-2-Reference.html 2007-10-05 15:06:05.000000000 +0200
+++ taskjuggler-2.4.0/TestSuite/HTML-Reports/htmlresourcereport-2-Reference.html 2007-10-05 15:11:25.000000000 +0200
@@ -178,7 +178,7 @@
<td style="text-align:right; padding-right:44; font-size:90%; ">60</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -357,7 +357,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">30</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1014,7 +1014,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">15</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1611,7 +1611,7 @@
<td style="text-align:right; padding-right:36; font-size:90%; ">15</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1762,7 +1762,7 @@
<td style="text-align:right; padding-right:28; font-size:90%; ">15</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1913,7 +1913,7 @@
<td style="text-align:right; padding-right:20; font-size:90%; ">15</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -2064,7 +2064,7 @@
<td style="text-align:right; padding-right:12; font-size:90%; ">15</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -2661,7 +2661,7 @@
<td style="text-align:right; padding-right:44; font-size:90%; ">30</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
diff -urNp taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmltaskreport-1-Reference.html taskjuggler-2.4.0/TestSuite/HTML-Reports/htmltaskreport-1-Reference.html
--- taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmltaskreport-1-Reference.html 2007-10-05 15:06:05.000000000 +0200
+++ taskjuggler-2.4.0/TestSuite/HTML-Reports/htmltaskreport-1-Reference.html 2007-10-05 15:11:58.000000000 +0200
@@ -436,7 +436,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -653,7 +653,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
@@ -1037,7 +1037,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td style="text-align:right; "> </td>
<td style="text-align:right; "> </td>
- <td style="text-align:right; ">1,0</td>
+ <td style="text-align:right; ">1,00</td>
<td style="text-align:left; "> </td>
<td style="text-align:right; "> </td>
<td style="text-align:left; "> </td>
diff -urNp taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmltaskreport-2-Reference.html taskjuggler-2.4.0/TestSuite/HTML-Reports/htmltaskreport-2-Reference.html
--- taskjuggler-2.4.0.orig/TestSuite/HTML-Reports/htmltaskreport-2-Reference.html 2007-10-05 15:06:05.000000000 +0200
+++ taskjuggler-2.4.0/TestSuite/HTML-Reports/htmltaskreport-2-Reference.html 2007-10-05 15:12:26.000000000 +0200
@@ -656,7 +656,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1038,7 +1038,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
@@ -1429,7 +1429,7 @@
<td style="text-align:right; padding-right:2; font-size:90%; ">30</td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
- <td rowspan="2" style="text-align:right; ">1,0</td>
+ <td rowspan="2" style="text-align:right; ">1,00</td>
<td rowspan="2" style="text-align:left; "> </td>
<td rowspan="2" style="text-align:right; "> </td>
<td rowspan="2" style="text-align:left; "> </td>
Index: taskjuggler.spec
===================================================================
RCS file: /cvs/extras/rpms/taskjuggler/F-7/taskjuggler.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- taskjuggler.spec 3 Jul 2007 10:54:33 -0000 1.10
+++ taskjuggler.spec 5 Oct 2007 13:54:24 -0000 1.11
@@ -1,10 +1,10 @@
Name: taskjuggler
Version: 2.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Project management tool
Group: Applications/Productivity
-License: GPL
+License: GPL+
URL: http://www.taskjuggler.org
Source0: http://www.taskjuggler.org/download/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -15,6 +15,8 @@
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+Patch0: taskjuggler-2.4.0-floatpointformat.patch
+
%description
TaskJuggler is a modern and powerful project management tool. Its new approach
to project planning and tracking is far superior to the commonly used Gantt
@@ -29,6 +31,8 @@
%prep
%setup -q
+#Floating point formatter bug with lost zeros(upstream)
+%patch0 -p1
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -97,6 +101,10 @@
%changelog
+* Fri Oct 5 2007 Ondrej Vasik <ovasik at redhat.com> - 2.4.0-3
+- fixed serious bug in floating point formatter(upstream)
+- fixed License tag
+
* Tue Jul 3 2007 Ondrej Vasik <ovasik at redhat.com> - 2.4.0-2
- new tarball from upstream(previous had one blocker included)
More information about the fedora-extras-commits
mailing list