1 files changed, 20 insertions, 8 deletions
diff --git a/redhat/main/tdevelop/tdevelop-14.0.0.spec b/redhat/main/tdevelop/tdevelop-14.0.0.spec
index f6eec9e16..44c3191e9 100644
--- a/redhat/main/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/main/tdevelop/tdevelop-14.0.0.spec
@@ -27,6 +27,7 @@
 %define tde_pkg tdevelop
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -126,11 +127,15 @@ BuildRequires:	subversion-devel
 # NEON support
 BuildRequires:	neon-devel
 
-# LDAP support
+# OPENLDAP support
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	openldap-devel
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
-%else
-BuildRequires:	openldap-devel
+%endif
+%if 0%{?rhel} == 5
+BuildRequires:	openldap24-libs-devel
 %endif
 
 # LIBACL support
@@ -168,9 +173,11 @@ individual needs.
 %{tde_bindir}/kdevdesigner
 %{tde_bindir}/tdevelop
 %{tde_bindir}/tdevelop-htdig
-%{tde_bindir}/kdevprj2tdevelop
+%{tde_bindir}/kdevprj2kdevelop
 %{tde_bindir}/kdevprofileeditor
 %{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
+%{tde_confdir}/kdevassistantrc
+%{tde_confdir}/tdeveloprc
 %{tde_tdeappdir}/kdevassistant.desktop
 %{tde_tdeappdir}/kdevdesigner.desktop
 %{tde_tdeappdir}/tdevelop.desktop
@@ -490,8 +497,6 @@ individual needs.
 %{tde_datadir}/apps/kdevtrollproject/
 %{tde_datadir}/apps/kdevvalgrind/
 %{tde_datadir}/apps/tdeio_pydoc/
-%{tde_datadir}/config/kdevassistantrc
-%{tde_datadir}/config/tdeveloprc
 %{tde_datadir}/desktop-directories/tde-development-tdevelop.directory
 %{tde_tdedocdir}/HTML/en/tdevelop/
 %{tde_libdir}/libd.so.0
@@ -624,6 +629,12 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
+# openldap 2.4 includes (CentOS 5)
+if [ -d "/usr/include/openldap24" ]; then
+  RPM_OPT_FLAGS="-I%{_includedir}/openldap24 -L%{_libdir}/openldap24 ${RPM_OPT_FLAGS}"
+fi
+
+
 if ! rpm -E %%cmake|grep -q "cd build"; then
   %__mkdir_p build
   cd build
@@ -641,6 +652,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
   -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
   -DLIB_INSTALL_DIR=%{tde_libdir} \
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -667,5 +679,5 @@ fi
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
+* Tue Jul 21 2015 Francois Andriot <francois.andriot@free.fr> - 14.0.1-1
+- Initial release