diff --git a/kdepim-kde#151150.patch b/kdepim-kde#151150.patch new file mode 100644 index 0000000..17d9c1a --- /dev/null +++ b/kdepim-kde#151150.patch @@ -0,0 +1,13 @@ +Index: kdepim/kmail/headerstyle.cpp +=================================================================== +--- kdepim/kmail/headerstyle.cpp (revision 779993) ++++ kdepim/kmail/headerstyle.cpp (revision 779994) +@@ -894,7 +894,7 @@ + // kmail icon + if(topLevel) { + headerStr += +- "
\n" ++ "
\n" + "\n" + "
\n"; + diff --git a/kdepim.spec b/kdepim.spec index 388d668..4bcf1fb 100644 --- a/kdepim.spec +++ b/kdepim.spec @@ -35,9 +35,9 @@ Source0: kdepim-enterprise-svn%{ent_date}.tar.bz2 # script used to generate svn checkout Source0 above Source1: kdepim-enterprise-svn_checkout.sh -Release: 5.%{ent_date}svn.ent%{?dist} +Release: 6.%{ent_date}svn.ent%{?dist} %else -Release: 5%{?dist} +Release: 6%{?dist} Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 %endif @@ -48,16 +48,18 @@ Source20: crystalsvg-conflicts.txt Patch1: kdepim-3.4.0-kandy-icons.patch Patch2: kdepim-xdg_open.patch + +## upstream patches # LANG=en_US.UTF-8 svn diff svn://anonsvn.kde.org/home/kde/tags/KDE/3.5.9/kdepim/kitchensync@774532 \ # svn://anonsvn.kde.org/home/kde/branches/work/kitchensync-OpenSync0.30API@774532 >kdepim-3.5.9-opensync03.patch Patch3: kdepim-3.5.9-opensync03.patch # http://websvn.kde.org/?view=rev&revision=775015 -# http://bugs.kde.org/show_bug.cgi?id=127696 +# http://bugs.kde.org/127696 # Upstream fix for "Unable to complete LIST operation" errors with some servers, -# just missed the 3.5.9 tagging. Patch4: kdepim-3.5.9-kde#127696.patch - -## upstream patches +# http://bugs.kde.org/151150 +# http://websvn.kde.org/?view=rev&revision=779994 +Patch5: kdepim-kde#151150.patch Patch100: kdepim-3.5.x-kmail-imap-crash.patch Provides: kdepim3 = %{version}-%{release} @@ -173,6 +175,7 @@ popd %endif %patch4 -p0 -b .kde127696 +%patch5 -p1 -b .kde151150 %patch100 -p0 -b .kmail-imap-crash @@ -307,6 +310,10 @@ rm -rf %{buildroot} %changelog +* Wed Feb 27 2008 Rex Dieter 6:3.5.9-6 +- "Enterprise headers" makes impossible to select text in + first paragraph of body (kde#151150) + * Mon Feb 18 2008 Than Ngo 6:3.5.9-5 - backport upstream patch to fix kmail crash on startup