rpms/kdeedu/F-11 kdeedu-4.4.2-qt47.patch, NONE, 1.1 .cvsignore, 1.72, 1.73 kdeedu.spec, 1.195, 1.196 sources, 1.74, 1.75
Rex Dieter
rdieter at fedoraproject.org
Sat Apr 3 14:09:24 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32645
Modified Files:
.cvsignore kdeedu.spec sources
Added Files:
kdeedu-4.4.2-qt47.patch
Log Message:
* Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 4.4.2-1
- 4.4.2
kdeedu-4.4.2-qt47.patch:
threadScriptExecution.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdeedu-4.4.2-qt47.patch ---
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)
{
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- .cvsignore 2 Mar 2010 13:55:40 -0000 1.72
+++ .cvsignore 3 Apr 2010 14:09:24 -0000 1.73
@@ -1 +1 @@
-kdeedu-4.4.1.tar.bz2
+kdeedu-4.4.2.tar.bz2
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/kdeedu.spec,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -p -r1.195 -r1.196
--- kdeedu.spec 2 Mar 2010 16:27:14 -0000 1.195
+++ kdeedu.spec 3 Apr 2010 14:09:24 -0000 1.196
@@ -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
## 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 <ltinkl at redhat.com> - 4.4.2-1
+- 4.4.2
+
* Tue Mar 02 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.1-4
- split out kdeedu-math-cantor-R subpackage due to huge R-core dependency
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/F-11/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources 2 Mar 2010 13:55:40 -0000 1.74
+++ sources 3 Apr 2010 14:09:24 -0000 1.75
@@ -1 +1 @@
-ef4bb9307043d807f97d8758a9ac1f8f kdeedu-4.4.1.tar.bz2
+69b9e54f4bd59c5816600c3d2828878b kdeedu-4.4.2.tar.bz2
More information about the scm-commits
mailing list