diff options
Diffstat (limited to 'redhat/core/tdeedu')
| -rw-r--r-- | redhat/core/tdeedu/tdeedu.spec | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/redhat/core/tdeedu/tdeedu.spec b/redhat/core/tdeedu/tdeedu.spec index 7bbef35e9..7cb4d8318 100644 --- a/redhat/core/tdeedu/tdeedu.spec +++ b/redhat/core/tdeedu/tdeedu.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 tdeedu %define tde_prefix /opt/trinity @@ -81,13 +81,21 @@ BuildRequires: fdupes BuildRequires: doxygen # 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 # LIBUSB support %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} @@ -103,7 +111,7 @@ BuildRequires: libusb-devel %endif # PYTHON3 support -%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150100 || 0%{?mgaversion} >= 8 %global python python3 %global __python %__python3 %global python_sitearch %{python3_sitearch} @@ -123,8 +131,12 @@ BuildRequires: %{_lib}boost_python3-devel BuildRequires: libboost_%{python}-devel %endif %if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} == 7 +BuildRequires: boost-python36-devel +%else BuildRequires: boost-%{python}-devel %endif +%endif # OCAML support %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 @@ -1153,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \ export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -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 |