Accepting request 1256407 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/1256407
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cmake?expand=0&rev=266

cmake.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Mar 26 14:14:39 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Switch cmake-gui builds to Qt6.
+- Add BuildRequires: qt6-macro to locate qhelpgenerator (in
+  %_qt6_libexecdir) and add corresponding path to env PATH.
+- Drop use of deprecated %suse_update_desktop_file macro and
+  BuildRequires: update-desktop-files needed solely for this.
+
 -------------------------------------------------------------------
 Tue Mar 11 06:54:19 UTC 2025 - Atri Bhattacharya <badshah400@gmail.com>
 

cmake.spec

@@ -109,11 +109,13 @@ BuildRequires:  pkgconfig(libcurl)
 %if %{with gui}
 BuildRequires:  python%{pyver}-Sphinx
 BuildRequires:  python%{pyver}-base
-BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  qt6-macros
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Widgets)
 %endif
 %if %{with qhelp}
-BuildRequires:  libqt5-qttools-qhelpgenerator
+BuildRequires:  qt6-tools-helpgenerators
 %endif
 
 %description
@@ -148,6 +150,10 @@ echo "`grep cmake-%{version}.tar.gz %{SOURCE5} | grep -Eo '^[0-9a-f]+'`  %{SOURC
 
 %build
 cp -p %{SOURCE99} .
+%if %{with qhelp}
+# Add path to qhelpgenerator
+export PATH+=":%{_qt6_libexecdir}"
+%endif
 %if %{with mini}
 # this is serial, so it takes too much time for the mini package
 %define _find_debuginfo_dwz_opts %{nil}
@@ -196,7 +202,6 @@ export CXXFLAGS="$CFLAGS"
 mkdir -p %{buildroot}%{_libdir}/cmake
 
 %if %{with gui}
-%suse_update_desktop_file  -r cmake-gui CMake Development IDE Tools Qt
 
 # delete files that belong to the 'cmake' package
 rm -rf %{buildroot}%{_bindir}/{cpack,cmake,ctest,ccmake}