jreznik pushed to taskjuggler (epel7). "new upstream beta2 release candidate"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 16:17:55 UTC 2015
>From 9b031aa379371362299f7b05b4f36985125a39a1 Mon Sep 17 00:00:00 2001
From: Ondrej Vasik <ovasik at fedoraproject.org>
Date: Mon, 28 Apr 2008 15:02:49 +0000
Subject: new upstream beta2 release candidate
diff --git a/.cvsignore b/.cvsignore
index 5781f4b..732b469 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-taskjuggler-2.4.0.tar.bz2
+taskjuggler-2.4.1_beta2.tar.bz2
diff --git a/sources b/sources
index 116b059..7d4490b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9076b5a1d2601f93ea4bc07780b7297 taskjuggler-2.4.0.tar.bz2
+353a171f889d31ecd1666de865d78684 taskjuggler-2.4.1_beta2.tar.bz2
diff --git a/taskjuggler-2.4.0-floatpointformat.patch b/taskjuggler-2.4.0-floatpointformat.patch
deleted file mode 100644
index 686e5b9..0000000
--- a/taskjuggler-2.4.0-floatpointformat.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-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>
diff --git a/taskjuggler-2.4.0-gcc43.patch b/taskjuggler-2.4.0-gcc43.patch
deleted file mode 100644
index 01d50dc..0000000
--- a/taskjuggler-2.4.0-gcc43.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -urNp taskjuggler-2.4.0-orig/taskjuggler/FileToken.cpp taskjuggler-2.4.0/taskjuggler/FileToken.cpp
---- taskjuggler-2.4.0-orig/taskjuggler/FileToken.cpp 2007-07-01 17:32:12.000000000 +0200
-+++ taskjuggler-2.4.0/taskjuggler/FileToken.cpp 2008-02-13 14:50:21.000000000 +0100
-@@ -10,6 +10,7 @@
- * $Id: $
- */
- #include "FileToken.h"
-+#include <cstdlib>
-
- #include "tjlib-internal.h"
-
-diff -urNp taskjuggler-2.4.0-orig/taskjuggler/FileToken.h taskjuggler-2.4.0/taskjuggler/FileToken.h
---- taskjuggler-2.4.0-orig/taskjuggler/FileToken.h 2007-07-01 17:32:12.000000000 +0200
-+++ taskjuggler-2.4.0/taskjuggler/FileToken.h 2008-02-13 13:35:13.000000000 +0100
-@@ -15,6 +15,8 @@
- #include <qtextstream.h>
- #include <qptrlist.h>
-
-+#include <memory>
-+
- #include "MacroTable.h"
- #include "Token.h"
-
-diff -urNp taskjuggler-2.4.0-orig/taskjuggler/ProjectFile.cpp taskjuggler-2.4.0/taskjuggler/ProjectFile.cpp
---- taskjuggler-2.4.0-orig/taskjuggler/ProjectFile.cpp 2007-07-01 17:32:12.000000000 +0200
-+++ taskjuggler-2.4.0/taskjuggler/ProjectFile.cpp 2008-02-13 13:34:09.000000000 +0100
-@@ -14,6 +14,7 @@
- #include "ProjectFile.h"
-
- #include <stdlib.h>
-+#include <memory>
-
- #include <qtextstream.h>
- #include <qregexp.h>
-diff -urNp taskjuggler-2.4.0-orig/taskjuggler/Scenario.h taskjuggler-2.4.0/taskjuggler/Scenario.h
---- taskjuggler-2.4.0-orig/taskjuggler/Scenario.h 2007-07-01 17:32:12.000000000 +0200
-+++ taskjuggler-2.4.0/taskjuggler/Scenario.h 2008-02-13 14:12:27.000000000 +0100
-@@ -23,7 +23,7 @@ class Scenario : public CoreAttributes
- CoreAttributes* c2,
- int level);
- public:
-- Scenario(Project* p, const QString& i, const QString& n, Scenario* p);
-+ Scenario(Project* p, const QString& i, const QString& n, Scenario* pr);
- virtual ~Scenario();
-
- virtual CAType getType() const { return CA_Scenario; }
-diff -urNp taskjuggler-2.4.0-orig/taskjuggler/XMLFile.h taskjuggler-2.4.0/taskjuggler/XMLFile.h
---- taskjuggler-2.4.0-orig/taskjuggler/XMLFile.h 2007-07-01 17:32:12.000000000 +0200
-+++ taskjuggler-2.4.0/taskjuggler/XMLFile.h 2008-02-13 15:28:07.000000000 +0100
-@@ -76,57 +76,57 @@ private:
-
- bool parseNode(const ParserNode* pn, QDomNode n, ParserTreeContext ptc);
-
-- bool doTaskJuggler(QDomNode& n, ParserTreeContext& n);
-- bool doProject(QDomNode& n, ParserTreeContext& n);
-- bool doProjectStart(QDomNode& n, ParserTreeContext& n);
-- bool doProjectEnd(QDomNode& n, ParserTreeContext& n);
-- bool doProjectNow(QDomNode& n, ParserTreeContext& n);
-- bool doCurrencyFormat(QDomNode& n, ParserTreeContext& n);
-- bool doScenario(QDomNode& n, ParserTreeContext& n);
-- bool doExtend(QDomNode& n, ParserTreeContext& n);
-- bool doExtendAttribute(QDomNode& n, ParserTreeContext& n);
-- bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-- bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-- bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-- bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-- bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& n);
-- bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& n);
-- bool doTimeInterval(QDomNode& n, ParserTreeContext& n);
-- bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& n);
-- bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& n);
-- bool doProjectVacation(QDomNode& n, ParserTreeContext& n);
-- bool doResourceVacation(QDomNode& n, ParserTreeContext& n);
-- bool doVacationStart(QDomNode& n, ParserTreeContext& n);
-- bool doVacationEnd(QDomNode& n, ParserTreeContext& n);
-- bool doCustomAttribute(QDomNode& n, ParserTreeContext& n);
-- bool doTextAttribute(QDomNode& n, ParserTreeContext& n);
-- bool doReferenceAttribute(QDomNode& n, ParserTreeContext& n);
-- bool doShiftList(QDomNode& n, ParserTreeContext& n);
-- bool doShift(QDomNode& n, ParserTreeContext& n);
-- bool doResourceList(QDomNode& n, ParserTreeContext& n);
-- bool doResource(QDomNode& n, ParserTreeContext& n);
-- bool doShiftSelection(QDomNode& n, ParserTreeContext& n);
-- bool doAccountList(QDomNode& n, ParserTreeContext& n);
-- bool doAccount(QDomNode& n, ParserTreeContext& n);
-- bool doTaskList(QDomNode& n, ParserTreeContext& n);
-- bool doTask(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenario(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& n);
-- bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& n);
-- bool doAllocate(QDomNode& n, ParserTreeContext& n);
-- bool doCandidate(QDomNode& n, ParserTreeContext& n);
-- bool doDepends(QDomNode& n, ParserTreeContext& n);
-- bool doPrecedes(QDomNode& n, ParserTreeContext& n);
-+ bool doTaskJuggler(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProject(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectNow(QDomNode& n, ParserTreeContext& ptc);
-+ bool doCurrencyFormat(QDomNode& n, ParserTreeContext& ptc);
-+ bool doScenario(QDomNode& n, ParserTreeContext& ptc);
-+ bool doExtend(QDomNode& n, ParserTreeContext& ptc);
-+ bool doExtendAttribute(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
-+ bool doShiftWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
-+ bool doShiftWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResourceWeekdayWorkingHours(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResourceWeekdayWorkingHoursPost(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTimeInterval(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTimeIntervalStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTimeIntervalEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doProjectVacation(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResourceVacation(QDomNode& n, ParserTreeContext& ptc);
-+ bool doVacationStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doVacationEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doCustomAttribute(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTextAttribute(QDomNode& n, ParserTreeContext& ptc);
-+ bool doReferenceAttribute(QDomNode& n, ParserTreeContext& ptc);
-+ bool doShiftList(QDomNode& n, ParserTreeContext& ptc);
-+ bool doShift(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResourceList(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResource(QDomNode& n, ParserTreeContext& ptc);
-+ bool doShiftSelection(QDomNode& n, ParserTreeContext& ptc);
-+ bool doAccountList(QDomNode& n, ParserTreeContext& ptc);
-+ bool doAccount(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskList(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTask(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenario(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioMaxEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioMinEnd(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioMaxStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doTaskScenarioMinStart(QDomNode& n, ParserTreeContext& ptc);
-+ bool doAllocate(QDomNode& n, ParserTreeContext& ptc);
-+ bool doCandidate(QDomNode& n, ParserTreeContext& ptc);
-+ bool doDepends(QDomNode& n, ParserTreeContext& ptc);
-+ bool doPrecedes(QDomNode& n, ParserTreeContext& ptc);
- bool doDependencyGapScenario(QDomNode& n, ParserTreeContext& ptc);
-- bool doNote(QDomNode& n, ParserTreeContext& n);
-- bool doFlag(QDomNode& n, ParserTreeContext& n);
-- bool doResourceBooking(QDomNode& n, ParserTreeContext& n);
-- bool doBooking(QDomNode& n, ParserTreeContext& n);
-- bool doBookingPost(QDomNode& n, ParserTreeContext& n);
-+ bool doNote(QDomNode& n, ParserTreeContext& ptc);
-+ bool doFlag(QDomNode& n, ParserTreeContext& ptc);
-+ bool doResourceBooking(QDomNode& n, ParserTreeContext& ptc);
-+ bool doBooking(QDomNode& n, ParserTreeContext& ptc);
-+ bool doBookingPost(QDomNode& n, ParserTreeContext& ptc);
-
- QString masterFile;
- Project* project;
diff --git a/taskjuggler-2.4.0-zoomingreportcrash.patch b/taskjuggler-2.4.0-zoomingreportcrash.patch
deleted file mode 100644
index 0127c32..0000000
--- a/taskjuggler-2.4.0-zoomingreportcrash.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -urNp taskjuggler-2.4.0-orig/TaskJugglerUI/ReportManager.cpp taskjuggler-2.4.0/TaskJugglerUI/ReportManager.cpp
---- taskjuggler-2.4.0-orig/TaskJugglerUI/ReportManager.cpp 2007-07-01 17:32:11.000000000 +0200
-+++ taskjuggler-2.4.0/TaskJugglerUI/ReportManager.cpp 2008-01-10 17:32:33.000000000 +0100
-@@ -355,13 +355,16 @@ ReportManager::showReport(QListViewItem*
- * summary report. The summary report has no report definition, so it
- * can be identified by a 0 pointer. */
- for (std::list<ManagedReportInfo*>::const_iterator
-- mri = reports.begin();
-- mri != reports.end(); ++mri)
-- if ((*mri)->getProjectReport() == 0)
-+ mri = reports.begin(); mri != reports.end(); ++mri)
-+ if ((*mri)->getProjectReport() == 0)
-+ {
- mr = *mri;
-+ break;
-+ }
- }
-
- TjUIReportBase* tjr = mr->getReport();
-+ bool result = true;
- if (tjr == 0)
- {
- if (mr->getProjectReport() == 0)
-@@ -377,7 +380,7 @@ ReportManager::showReport(QListViewItem*
- CSVReport* csvReport =
- dynamic_cast<CSVReport*>(mr->getProjectReport());
- if (!csvReport->generate())
-- return false;
-+ result = false;
- // show the CSV file in preferred CSV handler
- KURL reportUrl =
- KURL::fromPathOrURL(mr->getProjectReport()->
-@@ -387,7 +390,6 @@ ReportManager::showReport(QListViewItem*
- changeStatusBar(i18n("Displaying CSV report: '%1'")
- .arg(mr->getProjectReport()->getFileName()));
- KRun::runURL(reportUrl, "text/x-csv");
-- return true;
- }
- else if (strncmp(mr->getProjectReport()->getType(), "HTML", 4) == 0)
- tjr = new TjHTMLReport(reportStack, this, mr->getProjectReport());
-@@ -396,17 +398,19 @@ ReportManager::showReport(QListViewItem*
- ICalReport* icalReport =
- dynamic_cast<ICalReport*>(mr->getProjectReport());
- if (!icalReport->generate())
-- return false;
-- // show the TODO list in Korganizer
-- KURL reportUrl =
-- KURL::fromPathOrURL(mr->getProjectReport()->
-- getDefinitionFile());
-- reportUrl.setFileName(mr->getProjectReport()->getFileName());
--
-- changeStatusBar(i18n("Displaying iCalendar: '%1'")
-- .arg(mr->getProjectReport()->getFileName()));
-- KRun::runURL(reportUrl, "text/calendar");
-- return true;
-+ result = false;
-+ else
-+ {
-+ // show the TODO list in Korganizer
-+ KURL reportUrl =
-+ KURL::fromPathOrURL(mr->getProjectReport()->
-+ getDefinitionFile());
-+ reportUrl.setFileName(mr->getProjectReport()->getFileName());
-+
-+ changeStatusBar(i18n("Displaying iCalendar: '%1'")
-+ .arg(mr->getProjectReport()->getFileName()));
-+ KRun::runURL(reportUrl, "text/calendar");
-+ }
- }
- else if (strncmp(mr->getProjectReport()->getType(), "Export", 6) == 0)
- {
-@@ -414,23 +418,24 @@ ReportManager::showReport(QListViewItem*
- ExportReport* exportReport =
- dynamic_cast<ExportReport*>(mr->getProjectReport());
- if (!exportReport->generate())
-- return false;
--
-- // Get the full file name as URL and show it in the editor
-- KURL reportUrl =
-- KURL::fromPathOrURL(mr->getProjectReport()->getFullFileName());
-- if (reportUrl.url().right(4) == ".tjp")
-- {
-- changeStatusBar(i18n("Starting new TaskJuggler for '%1'")
-- .arg(mr->getProjectReport()->getFileName()));
-- KRun::runURL(reportUrl, "application/x-tjp");
-- }
-+ result = false;
- else
- {
-- emit signalEditFile(reportUrl);
-- showReportTab = false;
-+ // Get the full file name as URL and show it in the editor
-+ KURL reportUrl =
-+ KURL::fromPathOrURL(mr->getProjectReport()->getFullFileName());
-+ if (reportUrl.url().right(4) == ".tjp")
-+ {
-+ changeStatusBar(i18n("Starting new TaskJuggler for '%1'")
-+ .arg(mr->getProjectReport()->getFileName()));
-+ KRun::runURL(reportUrl, "application/x-tjp");
-+ }
-+ else
-+ {
-+ emit signalEditFile(reportUrl);
-+ showReportTab = false;
-+ }
- }
-- return true;
- }
- else if (strncmp(mr->getProjectReport()->getType(), "XMLReport", 9)
- == 0)
-@@ -448,36 +453,44 @@ ReportManager::showReport(QListViewItem*
- else
- changeStatusBar(i18n("Could not generated report '%1'")
- .arg(mr->getProjectReport()->getFileName()));
-- return result;
- }
- else
- {
- kdDebug() << "Report type " << mr->getProjectReport()->getType()
- << " not yet supported" << endl;
-- return false;
-+ result = false;
- }
-
-- if (tjr)
-+ if (!tjr)
- {
-- connect(tjr, SIGNAL(signalChangeStatusBar(const QString&)),
-- this, SLOT(changeStatusBar(const QString&)));
-- connect(tjr, SIGNAL(signalEditCoreAttributes(CoreAttributes*)),
-- this, SLOT(editCoreAttributes(CoreAttributes*)));
-+ /* A report with no widget that can be embedded in the report view
-+ * has been selected. We fall back to show the summary report and
-+ * unselect the selected browser item. */
-+ if (browser->currentItem())
-+ browser->setSelected(browser->currentItem(), false);
-+ tjr = new TjSummaryReport(reportStack, this, project);
-+ }
-
-- if (!tjr->generateReport())
-- {
-- delete tjr;
-- return false;
-- }
-+ connect(tjr, SIGNAL(signalChangeStatusBar(const QString&)),
-+ this, SLOT(changeStatusBar(const QString&)));
-+ connect(tjr, SIGNAL(signalEditCoreAttributes(CoreAttributes*)),
-+ this, SLOT(editCoreAttributes(CoreAttributes*)));
-
-- reportStack->addWidget(tjr);
-- mr->setReport(tjr);
-+ if (!tjr->generateReport())
-+ {
-+ delete tjr;
-+ if (browser->currentItem())
-+ browser->setSelected(browser->currentItem(), false);
-+ return false;
- }
-+
-+ reportStack->addWidget(tjr);
-+ mr->setReport(tjr);
- }
-- if (tjr)
-- reportStack->raiseWidget(tjr);
-
-- return true;
-+ reportStack->raiseWidget(tjr);
-+
-+ return result;
- }
-
- void
diff --git a/taskjuggler.spec b/taskjuggler.spec
index b92da16..df99059 100644
--- a/taskjuggler.spec
+++ b/taskjuggler.spec
@@ -1,12 +1,12 @@
Name: taskjuggler
-Version: 2.4.0
-Release: 7%{?dist}
+Version: 2.4.1
+Release: 0.1.beta2%{?dist}
Summary: Project management tool
Group: Applications/Productivity
License: GPL+
URL: http://www.taskjuggler.org
-Source0: http://www.taskjuggler.org/download/%{name}-%{version}.tar.bz2
+Source0: http://www.taskjuggler.org/download/%{name}-%{version}_beta2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kdepim-devel
@@ -16,10 +16,6 @@ Requires: %{name}-libs = %{version}-%{release}
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-Patch0: taskjuggler-2.4.0-floatpointformat.patch
-Patch1: taskjuggler-2.4.0-zoomingreportcrash.patch
-Patch2: taskjuggler-2.4.0-gcc43.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
@@ -39,14 +35,7 @@ Obsoletes: %{name} < %{version}-{%release}
Libraries for TaskJuggler package.
%prep
-%setup -q
-
-#Floating point formatter bug with lost zeros(upstream)
-%patch0 -p1
-#Fixed crash when zooming a report after a non-embedded report has been viewed.
-%patch1 -p1
-#Patch for gcc43 compiling issues
-%patch2 -p1
+%setup -q -n %{name}-%{version}_beta2
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
@@ -117,6 +106,9 @@ fi
%{_libdir}/libtaskjuggler*
%changelog
+* Mon Apr 28 2008 Ondrej Vasik <ovasik at redhat.com> - 2.4.1-0.1.beta2
+- upstream beta2 release candidate
+
* Thu Mar 6 2008 Ondrej Vasik <ovasik at redhat.com> - 2.4.0-7
- separate libs subpackage (#343251, multiarch conflicts)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/taskjuggler.git/commit/?h=epel7&id=9b031aa379371362299f7b05b4f36985125a39a1
More information about the scm-commits
mailing list