diff --git a/cmake-gui.changes b/cmake-gui.changes
index 0f30eb0..afb84c5 100644
--- a/cmake-gui.changes
+++ b/cmake-gui.changes
@@ -1,9 +1,14 @@
+-------------------------------------------------------------------
+Wed Apr  4 10:46:28 UTC 2018 - mpluskal@suse.com
+
+- Cleanup spec file with spec-clener
+- Drop conditions for building on Leap
+
 -------------------------------------------------------------------
 Wed Mar 28 22:41:54 UTC 2018 - foss@grueninger.de
 
 - Updateo to 3.11.0
   * No changes specific to CMake-GUI
-- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream
 
 -------------------------------------------------------------------
 Fri Mar 16 19:05:39 UTC 2018 - avindra@opensuse.org
diff --git a/cmake-gui.spec b/cmake-gui.spec
index b15234e..e8d161e 100644
--- a/cmake-gui.spec
+++ b/cmake-gui.spec
@@ -23,7 +23,7 @@ Release:        0
 Summary:        CMake graphical user interface
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-Url:            https://www.cmake.org/
+URL:            https://www.cmake.org/
 Source0:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz
 Source5:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt
 Source6:        https://www.cmake.org/files/v%{shortversion}/cmake-%{version}-SHA-256.txt.asc
@@ -37,22 +37,15 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libexpat-devel
-BuildRequires:  openssl-devel
-BuildRequires:  rhash-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
+BuildRequires:  openssl-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320
 #BuildRequires:  pkgconfig(jsoncpp)
 #endif
 BuildRequires:  pkgconfig
 BuildRequires:  python-sphinx
+BuildRequires:  rhash-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -96,7 +89,7 @@ export CXXFLAGS="%{optflags}"
     --verbose \
     --qt-gui \
     -- \
-    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib}
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
diff --git a/cmake.changes b/cmake.changes
index fde7cc8..3d6f458 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr  4 10:46:49 UTC 2018 - mpluskal@suse.com
+
+- Clenup spec file with spec-cleaner
+- Drop conditions for building on Leap
+
 -------------------------------------------------------------------
 Wed Mar 28 22:27:12 UTC 2018 - foss@grueninger.de
 
@@ -13,6 +19,7 @@ Wed Mar 28 22:27:12 UTC 2018 - foss@grueninger.de
     methods supported by ExternalProject_Add().
   full changelog: https://cmake.org/cmake/help/v3.11/release/3.11.html
 - Adapted form.patch and c17-default.patch
+- Drop cmake-3.10.1_boost-1.66.patch as it is included in upstream
 
 -------------------------------------------------------------------
 Fri Mar 16 19:06:10 UTC 2018 - avindra@opensuse.org
diff --git a/cmake.spec b/cmake.spec
index 2dfa651..d93d72e 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -23,7 +23,7 @@ Release:        0
 Summary:        Cross-platform, open-source make system
 License:        BSD-3-Clause
 Group:          Development/Tools/Building
-Url:            https://www.cmake.org/
+URL:            https://www.cmake.org/
 Source0:        https://www.cmake.org/files/v%{shortversion}/%{name}-%{version}.tar.gz
 Source1:        cmake.macros
 # bnc#947585 - Let CMake produces automatic RPM provides
@@ -40,31 +40,20 @@ Patch5:         system-libs.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch7:         feature-suse-python-interp-search-order.patch
 Patch8:         c17-default.patch
-%if 0%{?suse_version} >= 1330
-BuildRequires:  libcurl-mini-devel
-%else
-BuildRequires:  curl-devel
-%endif
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libbz2-devel
+BuildRequires:  libcurl-mini-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  rhash-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
 BuildRequires:  ncurses-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320
 #BuildRequires:  pkgconfig(jsoncpp)
 #endif
 BuildRequires:  pkgconfig
+BuildRequires:  rhash-devel
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(liblzma)
 Requires:       make
@@ -97,7 +86,7 @@ export CXXFLAGS="%{optflags}"
     --verbose \
     --no-qt-gui \
     -- \
-    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=%{use_system_uvlib}
+    -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=ON
 make VERBOSE=1 %{?_smp_mflags}
 
 %install