$ git diff --patch-with-stat --summary c1e3f4f9665fe969734da08e18910c7981b0f7a1..d4234553b69e3f42b2a761d34d2ac42c99421bd3

 .abf.yml                           |  2 +-
 cmake-3.11.0-pthread-linkage.patch | 11 -----------
 cmake.spec                         | 30 +++++++++++++++++++++++-------
 3 files changed, 24 insertions(+), 19 deletions(-)
 delete mode 100644 cmake-3.11.0-pthread-linkage.patch

diff --git a/.abf.yml b/.abf.yml
index ed2ebb5..afa2a93 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  cmake-3.14.5.tar.gz: a4c021c4fa91e812b87d9c88fdd047ead4201a2f
+  cmake-3.15.4.tar.gz: 0bef17d6067df2672edf63d20c8ec9289a82648d
diff --git a/cmake-3.11.0-pthread-linkage.patch b/cmake-3.11.0-pthread-linkage.patch
deleted file mode 100644
index c7b84a4..0000000
--- a/cmake-3.11.0-pthread-linkage.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake-3.11.0-rc1/Source/CMakeLists.txt.omv~	2018-02-22 14:35:49.295950116 +0100
-+++ cmake-3.11.0-rc1/Source/CMakeLists.txt	2018-02-22 14:47:51.798203077 +0100
-@@ -757,7 +757,7 @@ endforeach()
- 
- # create a library used by the command line and the GUI
- add_library(CMakeLib ${SRCS})
--target_link_libraries(CMakeLib cmsys
-+target_link_libraries(CMakeLib cmsys pthread
-   ${CMAKE_EXPAT_LIBRARIES} ${CMAKE_ZLIB_LIBRARIES}
-   ${CMAKE_TAR_LIBRARIES} ${CMAKE_COMPRESS_LIBRARIES}
-   ${CMAKE_CURL_LIBRARIES}
diff --git a/cmake.spec b/cmake.spec
index a47f0f0..5813d9f 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -2,13 +2,24 @@
 
 %bcond_with bootstrap
 
+%if %{with bootstrap}
+%bcond_with gui
+%else
+# The RISC-V port doesn't have Qt yet
+%ifarch %{riscv}
+%bcond_with gui
+%else
+%bcond_without gui
+%endif
+%endif
+
 %define beta %{nil}
 
 Name:		cmake
 Summary:	Cross-platform, open-source make system
-Version:	3.14.5
+Version:	3.15.4
 %if "%{beta}" != ""
-Release:	0.%{beta}.1
+Release:	1
 Source0:	http://www.cmake.org/files/v%{shortVersion}/%{name}-%{version}-%{beta}.tar.gz
 %else
 Release:	1
@@ -28,7 +39,6 @@ Source3:	cmake.prov
 # And extended with a simplistic check for KDE Frameworks interdependencies
 Source4:	cmake.req
 Source100:	cmake.rpmlintrc
-Patch1:		cmake-3.11.0-pthread-linkage.patch
 Patch2:		cmake-3.9.0-clang-5.0.patch
 Patch3:		cmake-3.4.1-dont-override-fPIC-with-fPIE.patch
 BuildRequires:	perl
@@ -43,12 +53,17 @@ BuildRequires:	pkgconfig(bzip2)
 BuildRequires:	pkgconfig(libarchive)
 BuildRequires:	pkgconfig(libzstd)
 %if !%{with bootstrap}
+# We need a copy of ourselves for the cmake(*) dependency generator to work
+# and create all the cmake(*) Provides for the built-in modules
+BuildRequires:	cmake
+BuildRequires:	cmake(jsoncpp)
+%endif
+%if %{with gui}
 BuildRequires:	qmake5
 BuildRequires:	pkgconfig(Qt5Gui)
 BuildRequires:	pkgconfig(Qt5Widgets)
 BuildRequires:	qt5-platformtheme-gtk2
 BuildRequires:	rhash-devel
-BuildRequires:	cmake(jsoncpp)
 # Ensure tests of Qt5Gui's cmake builds don't result in an error
 # because libqdirectfb.so and friends have been "removed" since creating the
 # cmake module
@@ -103,7 +118,7 @@ Documentation for %{name}.
 
 #-----------------------------------------------------------------------------
 
-%if !%{with bootstrap}
+%if %{with gui}
 %package -n	%{name}-qtgui
 Summary:	Qt GUI Dialog for CMake - the Cross-platform, open-source make system
 Group:		Development/Other
@@ -155,10 +170,11 @@ cd build
     --datadir=/share/%{name} \
     --mandir=/share/man \
     --docdir=/share/doc/%{name} \
-%if !%{with bootstrap}
+%if %{with gui}
     --qt-gui \
     --qt-qmake=%{_bindir}/qmake-qt5 \
-%else
+%endif
+%if %{with bootstrap}
     --no-system-jsoncpp \
     --no-system-librhash \
 %endif