[qt5-qttools/el6] skip cmake %%check on el6
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 11 21:44:31 UTC 2013
commit c85f868033d612cab3807eb5508e829bfcf8e886
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Sep 11 16:44:01 2013 -0500
skip cmake %%check on el6
qt5-qttools.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/qt5-qttools.spec b/qt5-qttools.spec
index b7a741b..d838bd0 100644
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@@ -22,8 +22,10 @@ Source21: designer.desktop
Source22: linguist.desktop
Source23: qdbusviewer.desktop
-# %%check needs cmake
+# %%check needs cmake (and don't want to mess with cmake28)
+%if 0%{?fedora} || 0%{?rhel} > 6
BuildRequires: cmake
+%endif
BuildRequires: desktop-file-utils
BuildRequires: qt5-qtbase-devel >= %{version}
BuildRequires: qt5-qtbase-static
@@ -152,6 +154,7 @@ done
popd
## work-in-progress... -- rex
+%if 0%{?fedora} || 0%{?rhel} > 6
%check
export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix}
export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
@@ -161,6 +164,7 @@ pushd tests/auto/cmake/%{_target_platform}
cmake ..
ctest --output-on-failure ||:
popd
+%endif
%post
More information about the scm-commits
mailing list