summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies/dbus-tqt
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-11-24 16:48:53 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-11-24 16:48:53 +0100
commite9e7fa543273fffa8131b2244e5c994fe22616e2 (patch)
tree6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/dependencies/dbus-tqt
parent2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff)
downloadtde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz
tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/dependencies/dbus-tqt')
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec8
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec11
2 files changed, 10 insertions, 9 deletions
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 9353394e6..6be5cc05e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -102,10 +102,10 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
%endif
-%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/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index 68dac0e31..717d2043d 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -95,17 +95,18 @@ Development files for %{name}
%build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt?.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} == 4
export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
%endif
-%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" \