From 26a5163b0294c12259babb045e54c11977bae2c1951f79df13e6ad0c538de9b5 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 18 Nov 2016 03:18:32 +0000 Subject: [PATCH] Accepting request 440783 from home:simotek:branches:devel:tools:building Fix typo'd version number, apply the same libuv change to cmake-gui OBS-URL: https://build.opensuse.org/request/show/440783 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=276 --- cmake-gui.changes | 5 +++++ cmake-gui.spec | 13 ++++++++++++- cmake.spec | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/cmake-gui.changes b/cmake-gui.changes index 77c4d78..583dff7 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 17 21:25:36 UTC 2016 - sflees@suse.de + +- Fix typo in libuv detection + ------------------------------------------------------------------- Wed Nov 16 14:28:58 UTC 2016 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index a0a87cc..b60aac3 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -37,6 +37,14 @@ BuildRequires: gcc-c++ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libexpat-devel BuildRequires: openssl-devel +# use libuv package for Leap and Tumbleweed +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) +BuildRequires: libuv-devel +%define use_system_uvlib ON +# otherwise use libuv part of CMake tarball +%else +%define use_system_uvlib OFF +%endif # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0%{?suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) @@ -84,7 +92,10 @@ export CXXFLAGS="%{optflags}" --system-libs \ --no-system-jsoncpp \ --parallel=0%{jobs} \ - --qt-gui + --verbose \ + --qt-gui \ + -- \ + -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib} make VERBOSE=1 %{?_smp_mflags} %install diff --git a/cmake.spec b/cmake.spec index 63b56f9..7e33eca 100644 --- a/cmake.spec +++ b/cmake.spec @@ -43,7 +43,7 @@ BuildRequires: libarchive-devel >= 3.0.2 BuildRequires: libbz2-devel BuildRequires: libexpat-devel # use libuv package for Leap and Tumbleweed -%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1320 && 0%{?is_opensuse})) +%if (0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})) BuildRequires: libuv-devel %define use_system_uvlib ON # otherwise use libuv part of CMake tarball