From ff6e8760e99fb23cec37bb776ab7a0aab09de1bcfccffc4a32b2ef40cca4c692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 17 Oct 2014 12:21:45 +0000 Subject: [PATCH] Accepting request 257363 from home:olh:branches:devel:tools:building - Remove . from PATH to fix check Required for PMBS, and appearently also for OBS SLE11 build. OBS-URL: https://build.opensuse.org/request/show/257363 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=178 --- cmake.changes | 5 +++++ cmake.spec | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/cmake.changes b/cmake.changes index 4668097..1c70660 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 17 11:53:37 UTC 2014 - olaf@aepfle.de + +- Remove . from PATH to fix check + ------------------------------------------------------------------- Fri Sep 12 16:59:17 UTC 2014 - idonmez@suse.com diff --git a/cmake.spec b/cmake.spec index 0f9e605..8defa67 100644 --- a/cmake.spec +++ b/cmake.spec @@ -86,6 +86,30 @@ sed -i \ %fdupes %{buildroot}%{_datadir}/cmake %check +%if 0%{?suse_version} <= 1140 +# http://public.kitware.com/Bug/view.php?id=13237 +# 0013237: 25 - FindPackageTest (Failed) +# Our 11.4 and older have . in PATH, as a result check fails. +# Having '.' in PATH is not needed anyway, so remove it here. +oIFS=$IFS +IFS=: +NPATH= +for path in $PATH +do + if test "$path" = "." + then + continue + fi + if test -n "$NPATH" + then + NPATH="$NPATH:$path" + else + NPATH="$path" + fi +done +IFS=$oIFS +export PATH=$NPATH +%endif # Excluded tests: # TestUpload: uses internet connection # SimpleInstall: seems to fail due to RPATH strictness