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/tqtinterface | |
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/tqtinterface')
-rwxr-xr-x | redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec | 8 | ||||
-rwxr-xr-x | redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec index 4624ccbe9..bfa90ad66 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec @@ -123,10 +123,10 @@ Development files for %{name} %build unset QTDIR QTINC QTLIB -%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/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec index a153b133b..25e2c0256 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec @@ -120,12 +120,15 @@ Development files for %{name} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh -%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 + +pwd # Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under # another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...) |