diff options
Diffstat (limited to 'redhat/core/tdewebdev/tdewebdev.spec')
| -rw-r--r-- | redhat/core/tdewebdev/tdewebdev.spec | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/redhat/core/tdewebdev/tdewebdev.spec b/redhat/core/tdewebdev/tdewebdev.spec index 58bc4c371..d0ce64cce 100644 --- a/redhat/core/tdewebdev/tdewebdev.spec +++ b/redhat/core/tdewebdev/tdewebdev.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 tdewebdev %define tde_prefix /opt/trinity @@ -82,7 +82,12 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif +# XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) @@ -99,14 +104,16 @@ BuildRequires: libxml2-devel #endif # ICU support +%if 0%{?mdkver} +BuildRequires: %{_lib}icu-devel +%else BuildRequires: libicu-devel +%endif # Readline support BuildRequires: readline-devel -%if "%{?tde_version}" != "14.1.0" -%define build_tdefilereplace 1 -%endif +%define build_tdefilereplace 0 Obsoletes: trinity-kdewebdev-libs < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kdewebdev-libs = %{?epoch:%{epoch}:}%{version}-%{release} @@ -460,7 +467,7 @@ Requires: trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release} unset QTDIR QTLIB QTINC export PATH="%{tde_bindir}:${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 |