1 files changed, 17 insertions, 13 deletions
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index c5341e7c5..56eb5c18a 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdepim
 %define tde_prefix /opt/trinity
@@ -37,17 +37,9 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-
-# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%define with_gnokii 1
-BuildRequires:	gnokii-devel
-%endif
-
 # TDEPIM optional features
 #define		with_kitchensync 1
 
-
 Name:		trinity-%{tde_pkg}
 Summary:	Personal Information Management apps from the official Trinity release
 Version:	%{tde_version}
@@ -110,11 +102,23 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	gamin-devel
 %endif
 
+# KDEPIM specific features
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
+%define with_gnokii 1
+BuildRequires:	gnokii-devel
+%endif
+%endif
+
+
 # FLEX support
 %if 0%{?fedora} >= 15
 BuildRequires:	flex-static
 %endif
 
+# BISON support
+BuildRequires:	bison
+
 # CURL support
 BuildRequires:	curl-devel
 
@@ -144,7 +148,7 @@ BuildRequires:	libXcomposite-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
@@ -891,8 +895,8 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
 
 %files -n trinity-kmail
 %defattr(-,root,root,-)
-%{tde_confdir}/kmail.antispamrc
-%{tde_confdir}/kmail.antivirusrc
+%config(noreplace) %{tde_confdir}/kmail.antispamrc
+%config(noreplace) %{tde_confdir}/kmail.antivirusrc
 %{tde_bindir}/kmail
 %{tde_bindir}/kmail_*.sh
 %{tde_tdelibdir}/kcm_kmail.la
@@ -1527,7 +1531,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
 
 %files -n trinity-libkleopatra
 %defattr(-,root,root,-)
-%{tde_confdir}/libkleopatrarc
+%config(noreplace) %{tde_confdir}/libkleopatrarc
 %{tde_libdir}/libgpgme++.so.*
 %{tde_libdir}/libkleopatra.so.*
 %{tde_libdir}/libkpgp.so.*