diff options
Diffstat (limited to 'redhat/core/tdevelop/tdevelop.spec')
| -rw-r--r-- | redhat/core/tdevelop/tdevelop.spec | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/redhat/core/tdevelop/tdevelop.spec b/redhat/core/tdevelop/tdevelop.spec index 5730a8207..3f718693b 100644 --- a/redhat/core/tdevelop/tdevelop.spec +++ b/redhat/core/tdevelop/tdevelop.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 tdevelop %define tde_prefix /opt/trinity @@ -137,8 +137,12 @@ BuildRequires: neon-devel # 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 @@ -148,11 +152,20 @@ BuildRequires: openldap24-libs-devel # LIBACL support %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +# ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel %endif +%endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %global python python3 @@ -317,8 +330,6 @@ individual needs. %{tde_tdelibdir}/libkdevphpsupport.so %{tde_tdelibdir}/libkdevpythonsupport.la %{tde_tdelibdir}/libkdevpythonsupport.so -%{tde_tdelibdir}/libkdevqt4importer.la -%{tde_tdelibdir}/libkdevqt4importer.so %{tde_tdelibdir}/libkdevqtimporter.la %{tde_tdelibdir}/libkdevqtimporter.so %{tde_tdelibdir}/libkdevquickopen.la @@ -437,7 +448,6 @@ individual needs. %{tde_datadir}/services/kdevpghpfoptions.desktop %{tde_datadir}/services/kdevphpsupport.desktop %{tde_datadir}/services/kdevpythonsupport.desktop -%{tde_datadir}/services/kdevqt4importer.desktop %{tde_datadir}/services/kdevqtimporter.desktop %{tde_datadir}/services/kdevquickopen.desktop %{tde_datadir}/services/kdevrbdebugger.desktop @@ -520,7 +530,6 @@ individual needs. %{tde_libdir}/libkinterfacedesigner.so.0.0.0 %{tde_tdelibdir}/libkdevvisualboyadvance.la %{tde_tdelibdir}/libkdevvisualboyadvance.so -%{tde_datadir}/apps/kdevdesignerpart/pics/ %{tde_datadir}/apps/kdevvisualboyadvance/ %{tde_tdedocdir}/HTML/en/tde_app_devel/ %{tde_datadir}/mimelnk/text/x-fortran.desktop @@ -625,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then 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 |