RHEL/Fedora: various updates

1 files changed, 46 insertions, 7 deletions

diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index 704718664..5a227ca79 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -19,7 +19,7 @@ BuildRequires: cmake >= 2.8
 
 Name:		trinity-kdepim
 Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
+Release:	6%{?dist}%{?_variant}
 License:	GPL
 Group:		Applications/Productivity
 
@@ -33,12 +33,23 @@ Source0:	kdepim-%{version}.tar.gz
 
 # [kdepim] Fix compilation with GCC 4.7 [Bug #958]
 Patch1:		kdepim-3.5.13-fix_gcc47_compilation.patch
-
 # [tdepim] Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]
 Patch2:		kdepim-3.5.13-fix_check_mail.patch
-
 # [tdepim] Fix kmail composer crash [Bug #953]
 Patch3:		kdepim-3.5.13-fix_composer_crash.patch
+# [tdepim] Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
+Patch4:		kdepim-3.5.13-fix_systray_count.patch
+# [tdepim] Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
+Patch5:		kdepim-3.5.13-fix_knotes_after_restored.patch
+# [tdepim] Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
+Patch6:		kdepim-3.5.13-fix_knotes_on_suspend.patch
+# [tdepim] Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
+Patch7:		kdepim-3.5.13-fix_linear_alphabet.patch
+# [tdepim] Fix infinite loop on IMAP4 authentication failure [Bug #1007]
+Patch8:		kdepim-3.5.13-fix_kio_imap4_infinite_loop.patch
+# [tdepim] Fix infinite loop on kmime_utils addquotes
+Patch9:		kdepim-3.5.13-fix_kio_imap4_addquotes.patch
+Patch10:	kdepim-3.5.13-fix_segv.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,7 +61,11 @@ BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
 BuildRequires:	libical-devel
 BuildRequires:	boost-devel
-BuildRequires:	curl-devel
+BuildRequires:	cyrus-sasl-devel
+BuildRequires:	libXcomposite-devel
+BuildRequires:	pcre-devel
+BuildRequires:	glib2-devel
+BuildRequires:	gcc-c++ make
 
 BuildRequires:	libcaldav-devel
 BuildRequires:	libcarddav-devel
@@ -61,10 +76,11 @@ BuildRequires:	gnokii-devel
 
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
-%else
-%if 0%{?rhel} <= 5
-BuildRequires:	trinity-libcurl-devel
 %endif
+%if 0%{?rhel} >= 0 && 0%{?rhel} <= 5
+BuildRequires:	trinity-libcurl-devel
+%else
+BuildRequires:	curl-devel
 %endif
 
 Requires:	trinity-kdelibs
@@ -88,6 +104,14 @@ Development files for %{name}.
 %patch1 -p1 -b .gcc47
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1 -b .addquotes
+%patch10 -p1 -b .segv
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -133,6 +157,14 @@ export PATH="%{_bindir}:${PATH}"
 %clean
 %__rm -rf %{?buildroot}
 
+%post
+for f in crystalsvg hicolor locolor ; do
+  touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
+  gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+done
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -170,6 +202,13 @@ export PATH="%{_bindir}:${PATH}"
 %{_datadir}/cmake/*.cmake
 
 %changelog
+* Sun May 27 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Fix KMail counting of unread messages in the system tray icon [Commit #40c435e5]
+- Fix knotes not appearing on the desktop when a session is restored. [Bug #987] [Commit #533f494f]
+- Fix knotes to not close notes during saving session. [Bug #987] [Commit #c48253af]
+- Fix linear alphabet string errors [Bug 635] [Commit #80bc593e]
+- Fix infinite loop on IMAP4 authentication failure [Bug #1007]
+
 * Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Fix compilation with GCC 4.7 [Bug #958]
 - Reverse patch from GIT hash 33e649c9. [Bug #406] [Commit #2d5f15c8]