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/tdeutils/tdeutils-14.0.0.spec | 11 +++++------ redhat/tdeutils/tdeutils-3.5.13.2.spec | 11 ++++++----- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'redhat/tdeutils') diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index d436ae9d2..fc510bd38 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -987,14 +987,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # Shitty hack for RHEL4 ... if [ -d "/usr/X11R6" ]; then export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}" - export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + 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" \ diff --git a/redhat/tdeutils/tdeutils-3.5.13.2.spec b/redhat/tdeutils/tdeutils-3.5.13.2.spec index 4350fc161..b8ed9aa9f 100644 --- a/redhat/tdeutils/tdeutils-3.5.13.2.spec +++ b/redhat/tdeutils/tdeutils-3.5.13.2.spec @@ -971,7 +971,8 @@ Development files for %{name}. %build -unset QTDIR || : ; source /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" @@ -984,10 +985,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.1