diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
| commit | e9e7fa543273fffa8131b2244e5c994fe22616e2 (patch) | |
| tree | 6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/dependencies/dbus-1-tqt | |
| parent | 2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff) | |
| download | tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip | |
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/dependencies/dbus-1-tqt')
| -rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec | 8 | ||||
| -rw-r--r-- | redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec index 80617a600..ac2822ce9 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec @@ -93,10 +93,10 @@ Development files for %{name} unset QTDIR QTINC QTLIB 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 %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec index 58f738326..f89fcf807 100644 --- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec +++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec @@ -90,13 +90,14 @@ 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} || 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" \ |