diff options
Diffstat (limited to 'redhat/core/tdeartwork/tdeartwork.spec')
| -rw-r--r-- | redhat/core/tdeartwork/tdeartwork.spec | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/redhat/core/tdeartwork/tdeartwork.spec b/redhat/core/tdeartwork/tdeartwork.spec index ad15a0c1d..ab1e7c3cb 100644 --- a/redhat/core/tdeartwork/tdeartwork.spec +++ b/redhat/core/tdeartwork/tdeartwork.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 tdeartwork %define tde_prefix /opt/trinity @@ -75,10 +75,14 @@ BuildRequires: gettext BuildRequires: libidn-devel # ESOUND support -BuildRequires: esound-devel +#BuildRequires: esound-devel # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # MESA support %if 0%{?rhel} || 0%{?fedora} @@ -86,8 +90,12 @@ BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel %endif %if 0%{?mdkversion} || 0%{?mgaversion} +%if 0%{?mdkver} +BuildRequires: %{_lib}glu-devel +%else BuildRequires: mesaglu-devel %endif +%endif %if 0%{?suse_version} BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGLU-devel @@ -172,7 +180,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # Metapackage @@ -740,7 +752,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -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 |