RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <[email protected]>

1 files changed, 23 insertions, 3 deletions

diff --git a/redhat/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index 878c2fbd0..80c14f13b 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.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 libtdeldap
 %define tde_prefix /opt/trinity
@@ -77,17 +77,25 @@ BuildRequires:	libtool-ltdl-devel
 %endif
 
 # SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}sasl-devel
+%else
 BuildRequires:	%{_lib}sasl2-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	cyrus-sasl-devel
 %endif
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
@@ -106,8 +114,12 @@ BuildRequires:	libheimdal-devel
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # LIBCOM_ERR support
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -118,13 +130,21 @@ BuildRequires:	%{_lib}ext2fs-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -181,7 +201,7 @@ if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then
   PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}"
 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