forked from pool/cmake
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
This commit is contained in:
parent
d33753251f
commit
766bc41d0f
@ -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
|
Fri Nov 13 09:24:08 UTC 2015 - mpluskal@suse.com
|
||||||
|
|
||||||
|
26
cmake.spec
26
cmake.spec
@ -51,10 +51,8 @@ Requires: make
|
|||||||
Requires: python-base
|
Requires: python-base
|
||||||
Recommends: cmake-mans
|
Recommends: cmake-mans
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
%if 0%{?suse_version} > 1110
|
|
||||||
BuildRequires: libarchive-devel >= 3.0.2
|
BuildRequires: libarchive-devel >= 3.0.2
|
||||||
BuildRequires: libbz2-devel
|
BuildRequires: libbz2-devel
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
CMake is a cross-platform, open-source build system
|
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
|
%fdupes %{buildroot}%{_datadir}/cmake
|
||||||
|
|
||||||
%check
|
%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:
|
# Excluded tests:
|
||||||
# TestUpload: uses internet connection
|
# TestUpload: uses internet connection
|
||||||
# SimpleInstall: seems to fail due to RPATH strictness
|
# SimpleInstall: seems to fail due to RPATH strictness
|
||||||
|
Loading…
Reference in New Issue
Block a user