diff --git a/.cvsignore b/.cvsignore index d4e8e7a..7111575 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdepim-4.3.2.tar.bz2 +kdepim-4.3.3.tar.bz2 diff --git a/kdepim-4.3.2-unbreak-ktimetracker.patch b/kdepim-4.3.2-unbreak-ktimetracker.patch deleted file mode 100644 index b017634..0000000 --- a/kdepim-4.3.2-unbreak-ktimetracker.patch +++ /dev/null @@ -1,12 +0,0 @@ -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(); - } diff --git a/kdepim.spec b/kdepim.spec index a340f2e..5f2d3f5 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -1,3 +1,4 @@ + %ifnarch s390 s390x %define _with_pilot_link 1 %endif @@ -5,22 +6,20 @@ Name: kdepim Summary: PIM (Personal Information Manager) applications Epoch: 6 -Version: 4.3.2 -Release: 2%{?dist} +Version: 4.3.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/Productivity URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + 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 -# 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) +# upstream patches (4.3 branch): Provides: kdepim4 = %{version}-%{release} @@ -99,7 +98,6 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %setup -q %patch0 -p1 -b .libqgpgme-link-fix %patch1 -p0 -b .kmail-saveAttachments -%patch100 -p0 -b .unbreak-ktimetracker %build @@ -218,6 +216,9 @@ rm -rf %{buildroot} %changelog +* Sat Oct 31 2009 Rex Dieter - 4.3.3-1 +- 4.3.3 + * Fri Oct 30 2009 Kevin Kofler - 4.3.2-2 - unbreak ktimetracker (#532055, kde#209570, patch from upstream) diff --git a/sources b/sources index 18ab828..fbccdfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e6a672bd681b2f19502798d7ed73fe8 kdepim-4.3.2.tar.bz2 +3a3c01abd6571cc337fa22d1c3601fe7 kdepim-4.3.3.tar.bz2