From f968105a977ca66f897245032e82ed4b9019bcc59d7e862c9b696d00c07b029d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 23 May 2018 07:32:09 +0000 Subject: [PATCH] Accepting request 610893 from home:mathletic:branches:devel:tools:building Fix CMake for Leap 42.3 and SLE 12 OBS-URL: https://build.opensuse.org/request/show/610893 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=325 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 10 ++++++++-- cmake.changes | 5 +++++ cmake.spec | 10 ++++++++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 274af58..045fb75 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 20 22:53:46 UTC 2018 - foss@grueninger.de + +- Use libuv provided by CMake for Leap 42.3. + ------------------------------------------------------------------- Thu May 17 20:26:45 UTC 2018 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index 92dd433..e0e82f8 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -37,7 +37,13 @@ BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel -BuildRequires: libuv-devel +# exclude for SLE 12 and Leap 42.x +%if 0%{?suse_version} == 1315 +%define system_libuv OFF +%else +BuildRequires: libuv-devel >= 1.10 +%define system_libuv ON +%endif BuildRequires: openssl-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -89,7 +95,7 @@ export CXXFLAGS="%{optflags}" --verbose \ --qt-gui \ -- \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv} make VERBOSE=1 %{?_smp_mflags} %install diff --git a/cmake.changes b/cmake.changes index 294a3a1..7a60f52 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun May 20 22:54:17 UTC 2018 - foss@grueninger.de + +- Use libuv provided by CMake for Leap 42.3 and SLE 12. + ------------------------------------------------------------------- Thu May 17 20:26:30 UTC 2018 - foss@grueninger.de diff --git a/cmake.spec b/cmake.spec index ad42c05..991f3f0 100644 --- a/cmake.spec +++ b/cmake.spec @@ -50,7 +50,13 @@ BuildRequires: libcurl-mini-devel BuildRequires: libcurl-devel %endif BuildRequires: libexpat-devel -BuildRequires: libuv-devel +# exclude for SLE 12 and Leap 42.x +%if 0%{?suse_version} == 1315 +%define system_libuv OFF +%else +BuildRequires: libuv-devel >= 1.10 +%define system_libuv ON +%endif BuildRequires: ncurses-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 @@ -90,7 +96,7 @@ export CXXFLAGS="%{optflags}" --verbose \ --no-qt-gui \ -- \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{system_libuv} make VERBOSE=1 %{?_smp_mflags} %install