From e9e7fa543273fffa8131b2244e5c994fe22616e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 24 Nov 2013 16:48:53 +0100 Subject: RPM Packaging: fix build issue on openSUSE 13.1 --- redhat/tdeaddons/tdeaddons-14.0.0.spec | 8 ++++---- redhat/tdeaddons/tdeaddons-3.5.13.2.spec | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'redhat/tdeaddons') diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index e52919c50..6d372f060 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -670,10 +670,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi if [ -d "/usr/include/db53" ]; then export CMAKE_INCLUDE_PATH="/usr/include/db53" diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec index 5ccf7a2a1..b45ca3e93 100644 --- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec +++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec @@ -686,7 +686,8 @@ done %build -unset QTDIR || : ; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -- cgit v1.2.1