diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..a71b2fd
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,4 @@
+
+ doc
+
+
diff --git a/extra-cmake-modules-5.92.0.tar.xz b/extra-cmake-modules-5.92.0.tar.xz
deleted file mode 100644
index c959c3d..0000000
--- a/extra-cmake-modules-5.92.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f89a238bc5f28738db25e29296b75b4f795e3e9bfe3a8f1f9390648749d303ef
-size 329884
diff --git a/extra-cmake-modules-5.92.0.tar.xz.sig b/extra-cmake-modules-5.92.0.tar.xz.sig
deleted file mode 100644
index 4b790ef..0000000
--- a/extra-cmake-modules-5.92.0.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmIjwjMACgkQWNDuZIpI
-s7srBggAm7KuDe7KUnu/ydSaJuqbW/SO7fiLZc+PgdNqQKvyTxzyNryr4+V7hWd4
-powvv/LB8/S55NVJPdX5rKO2KDrG1Zr4uvmZUu5OCX+DLSB7IpXh36RxOH5QCRNP
-i5b5e6lrKHN5/eQuzvzBYua+c5stBJqax778vpthLHSUPP+2CLX962u6GPjrX3Qr
-IWnCfF30qIs/BUimCvoEVCvLZTZwLblezeGdJBDg1ZWoD6jR8TL2/xLRTruYXXTn
-9mT8hzt0g94ZMf6XdhZU0v9BmUZJyDZ0xWdKeYWY3JBzAPqC7X1YmKbNo/pNJH4b
-1WHFldGqy12Vyu16I8Txd1HqvSn7ww==
-=7tls
------END PGP SIGNATURE-----
diff --git a/extra-cmake-modules-5.93.0.tar.xz b/extra-cmake-modules-5.93.0.tar.xz
new file mode 100644
index 0000000..16ad818
--- /dev/null
+++ b/extra-cmake-modules-5.93.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:093dea7b11647bc5f74e6971d47ef15b5c410cba2b4620acae00f008d5480b21
+size 331192
diff --git a/extra-cmake-modules-5.93.0.tar.xz.sig b/extra-cmake-modules-5.93.0.tar.xz.sig
new file mode 100644
index 0000000..94cba9e
--- /dev/null
+++ b/extra-cmake-modules-5.93.0.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmJIS7EACgkQWNDuZIpI
+s7u7iAf5AU8JyG37zliG1+6cRkm+s7yMGEO4ehjRz9KAyjv5NWDBLzbaVAkvHH0g
+y+cUot3el0/5plOIgqblhDx5aYMHzUuEYQ8HhaM1NEUqt1jx7HgfwP7H5Mh1XBQW
+/GeqvdzseEUDgb/u6MQvDJb4E2808tI0y1i07SIt3eGMYrhvKmbgvdJiR3gvNj0V
+0jsL3gM7A3q5OZ+Ly3BNcWG4pCcRfDGbPGw/5Gc0SztCFm01z69uK4t09grAcwU+
+z5QXXTqVGJ9I3YwMbd6/IGs0o2iFhuvrIBg/LBL/oTyHhzHMjUq5b5fFMZq5/MpZ
+uePTbcQBExJ3ubaFrIvlX6VtEvk+MA==
+=OF7a
+-----END PGP SIGNATURE-----
diff --git a/extra-cmake-modules.changes b/extra-cmake-modules.changes
index cccac2a..25bfbee 100644
--- a/extra-cmake-modules.changes
+++ b/extra-cmake-modules.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Sun Apr 3 10:46:56 UTC 2022 - Christophe Giboudeaux
+
+- Update to 5.93.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.93.0
+- Changes since 5.92.0:
+ * Fix finding qmake
+ * ECMQueryQt: don't fail when TRY is used
+ * ECMQueryQt: Add fallbacks
+ * Require tests to pass for the CI to pass
+ * Fix unit tests for ECMAddTests for Qt6 after db2adb479
+ * ECMAddQch: Make it work with Qt6::qhelpgenerator too
+ * Deprecate ECMQueryQmake, superseded by ECMQueryQt
+ * KDEInstallDirs6: port from custom logic to ecm_query_qt
+ * Port from ECMQueryQmake to ECMQueryQt
+ * Android: use the current cmake executable
+ * Fix clang-format git hook script
+ * autotests: link to QtCore for WinMain on Windows
+ * autotests: tentative Windows fix
+ * Add ECMQueryQt module, which encompases both Qt5 Qmake
+ and Qt6 qtpaths
+ * KDEClangFormat: se the same source file extensions in
+ clang-format script and target
+ * generate-fastlane-metadata: Don't fail if source URL can
+ not be found
+ * Fix checking the repository name for detached remotes
+ * Android: Set CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+ * Check that you're building the framework in a supported
+ platform
+ * Android: autodetect the use of llvm
+
-------------------------------------------------------------------
Mon Mar 7 09:26:40 UTC 2022 - Christophe Giboudeaux
@@ -15,6 +48,12 @@ Mon Mar 7 09:26:40 UTC 2022 - Christophe Giboudeaux
* Adapt Android toolchain file and FindGradle to Qt6
* Fix typos
+-------------------------------------------------------------------
+Sat Feb 26 20:43:04 UTC 2022 - Dirk Müller
+
+- split off -doc subpackage into a _multibuild so that dependent
+ builds can start while Sphinx is not yet built.
+
-------------------------------------------------------------------
Sun Feb 6 10:16:45 UTC 2022 - Christophe Giboudeaux
diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index ab5b55b..074a40e 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -16,7 +16,12 @@
#
-%define _tar_path 5.92
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "doc"
+%global pkg_suffix -doc
+%endif
+
+%define _tar_path 5.93
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
@@ -24,16 +29,16 @@
%bcond_without doc
# Only needed for the package signature condition
%bcond_without released
-Name: extra-cmake-modules
-Version: 5.92.0
+Name: extra-cmake-modules%{?pkg_suffix}
+Version: 5.93.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://www.kde.org
-Source: %{name}-%{version}.tar.xz
+Source: extra-cmake-modules-%{version}.tar.xz
%if %{with released}
-Source1: %{name}-%{version}.tar.xz.sig
+Source1: extra-cmake-modules-%{version}.tar.xz.sig
Source2: frameworks.keyring
%endif
# PATCH-FIX-OPENSUSE
@@ -41,35 +46,27 @@ Patch0: bundle-lang.patch
BuildRequires: cmake >= 3.16
BuildRequires: gcc-c++
BuildRequires: kf5-filesystem
+%if "%{flavor}" != "doc"
Requires: cmake >= 3.16
Requires: gcc-c++
Requires: kf5-filesystem
-Recommends: %{name}-doc
+Recommends: extra-cmake-modules-doc
Provides: kf5umbrella = 4.99.0
Obsoletes: kf5umbrella < 4.99.0
-%if %{with doc}
+%else
BuildRequires: python3-Sphinx
%endif
+BuildArch: noarch
%description
Extra modules and scripts for CMake.
+%if "%{flavor}" == "doc"
-For more information see https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
-
-%package doc
-Summary: Documentation for extra-cmake-modules
-Group: Documentation/Other
-Requires: %{name} = %{version}
-BuildArch: noarch
-
-%description doc
-Extra modules and scripts for CMake.
-
-For more information see https://community.kde.org/KDE_Core/Platform_11/Buildsystem/FindFilesSurvey
This package provides documentation for extra-cmake-modules
+%endif
%prep
-%autosetup -p1
+%autosetup -p1 -n extra-cmake-modules-%{version}
%build
%cmake_kf5 -d build
@@ -78,12 +75,15 @@ This package provides documentation for extra-cmake-modules
%install
%kf5_makeinstall -C build
+%if "%{flavor}" == "doc"
+rm -r %{buildroot}%{_datadir}/ECM
+%endif
+
%files
+%if "%{flavor}" != "doc"
%license LICENSES/*
%{_datadir}/ECM/
-
-%if %{with doc}
-%files doc
+%else
%doc %{_datadir}/doc/ECM/
%doc %lang(en) %{_mandir}/man7/ecm*.7*
%endif