Branch: master

d7eaab03 2015-04-15 16:24:46 François Andriot
RPM Packaging: update tdepim
M redhat/main/tdepim/tdepim-14.0.0.spec
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec
index 4e368f0..cfd2500 100644
--- a/redhat/main/tdepim/tdepim-14.0.0.spec
+++ b/redhat/main/tdepim/tdepim-14.0.0.spec
@@ -70,7 +70,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+%if 0%{?rhel} == 5
 Patch0:		%{tde_pkg}-%{version}.patch
+%endif
 
 BuildRequires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -971,7 +973,7 @@
 Summary:	Trinity Email client
 Group:		Applications/Communications
 Requires:	%{name}-tdeio-plugins = %{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{version}
+Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 # GPG support
 %if 0%{?suse_version}
@@ -992,7 +994,7 @@
 Requires:	procmail
 Requires:	trinity-kaddressbook = %{version}-%{release}
 Requires:	trinity-kleopatra = %{version}-%{release}
-Requires:	trinity-tdebase-tdeio-pim-plugins >= %{version}-%{release}
+Requires:	trinity-tdebase-tdeio-pim-plugins >= %{tde_version}
 
 Provides: imap-client, mail-reader