1 files changed, 36 insertions, 8 deletions
diff --git a/redhat/core/tdepim/tdepim.spec b/redhat/core/tdepim/tdepim.spec
index e3a9f483e..de1c98944 100644
--- a/redhat/core/tdepim/tdepim.spec
+++ b/redhat/core/tdepim/tdepim.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg tdepim
 %define tde_prefix /opt/trinity
@@ -75,15 +75,38 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	make
 
 BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
-BuildRequires:	libical-devel
 BuildRequires:	boost-devel
 BuildRequires:	pcre-devel
 BuildRequires:	libidn-devel
 
+# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ical-devel
+%else
+BuildRequires:	libical-devel
+%endif
+
+# GPG-ERROR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gpg-error-devel
+%else
+BuildRequires:	libgpg-error-devel
+%endif
+
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
+BuildRequires:	libacl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -126,8 +149,12 @@ BuildRequires:	curl-devel
 BuildRequires:	glib2-devel
 
 # SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}sasl-devel
+%else
 BuildRequires:	%{_lib}sasl2-devel
+%endif
 %else
 BuildRequires:	cyrus-sasl-devel
 %endif
@@ -187,9 +214,6 @@ BuildRequires:	xscreensaver-gl
 %endif
 %endif
 
-# ACL support
-BuildRequires:	libacl-devel
-
 
 Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -835,8 +859,12 @@ Requires:	gnupg2
 
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 Requires:	pinentry
+%if 0%{?mdkver}
+Requires:	gnupg
+%else
 Requires:	dirmngr
 %endif
+%endif
 
 %description -n trinity-kleopatra
 Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
@@ -1845,7 +1873,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi