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/tdepim/tdepim-14.0.0.spec | 8 ++++---- redhat/tdepim/tdepim-3.5.13.2.spec | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'redhat/tdepim') diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec index df37e0c89..2be7c765e 100644 --- a/redhat/tdepim/tdepim-14.0.0.spec +++ b/redhat/tdepim/tdepim-14.0.0.spec @@ -2198,10 +2198,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%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 # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec index 3c31f67ba..7d83cd64f 100644 --- a/redhat/tdepim/tdepim-3.5.13.2.spec +++ b/redhat/tdepim/tdepim-3.5.13.2.spec @@ -2197,7 +2197,8 @@ fi %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" @@ -2206,10 +2207,10 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%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 %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -- cgit v1.2.3