From 766bc41d0f7421dac34877b309b1d6a461065bd4081a3af445ff92427e5dde59 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 14 Nov 2015 09:12:58 +0000 Subject: [PATCH] Accepting request 344297 from home:mathletic:branches:devel:tools:building Remove special paths for 1110 and 1140 OBS-URL: https://build.opensuse.org/request/show/344297 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=232 --- cmake.changes | 5 +++++ cmake.spec | 26 -------------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/cmake.changes b/cmake.changes index e610e0a..c708ec8 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 13 21:03:02 UTC 2015 - foss@grueninger.de + +- Remove special paths for version 1110 and 1140 + ------------------------------------------------------------------- Fri Nov 13 09:24:08 UTC 2015 - mpluskal@suse.com diff --git a/cmake.spec b/cmake.spec index c519643..35d61a4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -51,10 +51,8 @@ Requires: make Requires: python-base Recommends: cmake-mans BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1110 BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel -%endif %description CMake is a cross-platform, open-source build system @@ -105,30 +103,6 @@ install -p -m0755 -D %{SOURCE4} %{buildroot}%{_libexecdir}/rpm/cmake.prov %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