From 244dce46a9eb56a8e3ed979fe19119e30fc079dd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 03 2010 14:08:48 +0000 Subject: - 4.4.2 --- diff --git a/.cvsignore b/.cvsignore index e7fb5b1..e8d3074 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdeedu-4.4.1.tar.bz2 +kdeedu-4.4.2.tar.bz2 diff --git a/kdeedu-4.4.2-qt47.patch b/kdeedu-4.4.2-qt47.patch new file mode 100644 index 0000000..1737c54 --- /dev/null +++ b/kdeedu-4.4.2-qt47.patch @@ -0,0 +1,12 @@ +diff -up kdeedu-4.4.2/rocs/src/Core/threadScriptExecution.cpp.qt47 kdeedu-4.4.2/rocs/src/Core/threadScriptExecution.cpp +--- kdeedu-4.4.2/rocs/src/Core/threadScriptExecution.cpp.qt47 2009-12-31 07:28:39.000000000 -0600 ++++ kdeedu-4.4.2/rocs/src/Core/threadScriptExecution.cpp 2010-04-01 15:24:44.376357578 -0500 +@@ -9,7 +9,7 @@ ThreadScriptExecution * self; + + ThreadScriptExecution::ThreadScriptExecution(KTextBrowser * debugView): + QThread(), +- _script(0), ++ _script(), + _graphDocument(0), + _txtDebug(debugView) + { diff --git a/kdeedu.spec b/kdeedu.spec index ca04e52..3455bb3 100644 --- a/kdeedu.spec +++ b/kdeedu.spec @@ -7,8 +7,8 @@ Name: kdeedu Summary: Educational/Edutainment applications -Version: 4.4.1 -Release: 4%{?dist} +Version: 4.4.2 +Release: 1%{?dist} License: GPLv2 Group: Amusements/Games @@ -19,6 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstreamable patches Patch51: kdeedu-4.3.90-cantor_part_desktop_fix.patch ## upstream patches +Patch100: kdeedu-4.4.2-qt47.patch Obsoletes: kdeedu4 < %{version}-%{release} Provides: kdeedu4 = %{version}-%{release} @@ -190,6 +191,7 @@ Group: System Environment/Libraries %setup -q -n kdeedu-%{version}%{?alphatag} %patch51 -p1 -b .cantor_part_desktop_fix.patch +%patch100 -p1 -b .qt47 %build @@ -574,6 +576,9 @@ rm -rf %{buildroot} %changelog +* Mon Mar 29 2010 Lukas Tinkl - 4.4.2-1 +- 4.4.2 + * Tue Mar 02 2010 Kevin Kofler - 4.4.1-4 - split out kdeedu-math-cantor-R subpackage due to huge R-core dependency diff --git a/sources b/sources index abf7738..55d760e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef4bb9307043d807f97d8758a9ac1f8f kdeedu-4.4.1.tar.bz2 +69b9e54f4bd59c5816600c3d2828878b kdeedu-4.4.2.tar.bz2