rpms/kdepim/devel kdepim-4.3.2-unbreak-ktimetracker.patch, NONE, 1.1 kdepim.spec, 1.239, 1.240

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8940/devel

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.3.2-unbreak-ktimetracker.patch 
Log Message:
* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- unbreak ktimetracker (#532055, kde#209570, patch from upstream)

kdepim-4.3.2-unbreak-ktimetracker.patch:
 mainwindow.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kdepim-4.3.2-unbreak-ktimetracker.patch ---
Index: ktimetracker/mainwindow.cpp
===================================================================
--- ktimetracker/mainwindow.cpp	(revision 1035758)
+++ ktimetracker/mainwindow.cpp	(revision 1035759)
@@ -73,6 +73,7 @@
       ((TimetrackerWidget) (m_part->widget())).openFile(icsfile);
       connect(configureAction, SIGNAL(triggered(bool)),
         m_part->widget(), SLOT(showSettingsDialog()));
+      ((TimetrackerWidget *) (m_part->widget()))->setupActions(actionCollection());
       m_part->openFile(icsfile);
       setupGUI();
     }


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- kdepim.spec	5 Oct 2009 14:44:04 -0000	1.239
+++ kdepim.spec	30 Oct 2009 19:44:26 -0000	1.240
@@ -6,7 +6,7 @@ Name:    kdepim
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,7 +15,10 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
 # http://bugzilla.redhat.com/show_bug.cgi?id=496988
 Patch1:  kdepim-4.3.1-kmail-saveAttachments.patch
-# 4.3.1 upstream
+# upstream patches (4.3 branch):
+# unbreak ktimetracker (#532055, kde#209570)
+# backported from 4.3.3: http://websvn.kde.org/?view=revision&revision=1035759
+Patch100: kdepim-4.3.2-unbreak-ktimetracker.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -96,6 +99,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
 %setup -q
 %patch0 -p1 -b .libqgpgme-link-fix
 %patch1 -p0 -b .kmail-saveAttachments
+%patch100 -p0 -b .unbreak-ktimetracker
 
 
 %build
@@ -214,6 +218,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 30 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- unbreak ktimetracker (#532055, kde#209570, patch from upstream)
+
 * Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2