[rpms/extra-cmake-modules] epel10: Merge branch f44 into epel10

[rpms/extra-cmake-modules] epel10: Merge branch f44 into epel10

[Troy Dawson]

A new commit has been pushed.

Repo   : rpms/extra-cmake-modules
Branch : epel10
Commit : 66790f4656847a1e599d4752263da9f23eea6ce1
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T08:37:23-07:00
Stats  : +86/-8 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/extra-cmake-modules/c/66790f4656847a1e599d4752263da9f23eea6ce1?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch b/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
new file mode 100644
index 0000000..17018a7
--- /dev/null
+++ b/0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
@@ -0,0 +1,55 @@
+From 79802fdb938ac3b3c6fc0b57eb2fcbf60100e0b0 Mon Sep 17 00:00:00 2001
+From: Steve Cossette <farchord@gmail.com>
+Date: Wed, 13 May 2026 21:47:52 -0400
+Subject: [PATCH] Revert "Add PYTHONPATH to prefix.sh if python is available"
+
+This reverts commit e46088158e5631417602322ecdc08cc692192134.
+---
+ kde-modules/KDESetupPrefixScript.cmake | 9 ---------
+ kde-modules/prefix.sh.cmake            | 2 --
+ kde-modules/prefix.sh.fish.cmake       | 2 --
+ 3 files changed, 13 deletions(-)
+
+diff --git a/kde-modules/KDESetupPrefixScript.cmake b/kde-modules/KDESetupPrefixScript.cmake
+index a1cc261a..b2bae93b 100644
+--- a/kde-modules/KDESetupPrefixScript.cmake
++++ b/kde-modules/KDESetupPrefixScript.cmake
+@@ -15,15 +15,6 @@ if (CMAKE_CROSSCOMPILING)
+     return()
+ endif()
+ 
+-find_package(Python3 COMPONENTS Interpreter)
+-if (Python3_EXECUTABLE)
+-    execute_process(COMMAND ${Python3_EXECUTABLE} -Esc "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${CMAKE_INSTALL_PREFIX}', 'base': '${CMAKE_INSTALL_PREFIX}'}))" OUTPUT_VARIABLE sysconfig_output)
+-    string(STRIP ${sysconfig_output} PYTHON_INSTALL_DIR)
+-
+-    set(SH_EXPORT_PYTHONPATH "export PYTHONPATH=\"${PYTHON_INSTALL_DIR}\":$PYTHONPATH")
+-    set(FISH_EXPORT_PYTHONPATH "set -x --path PYTHONPATH \"${PYTHON_INSTALL_DIR}\" $PYTHONPATH")
+-endif()
+-
+ configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh @ONLY)
+ 
+ find_program(FISH_EXECUTABLE fish)
+diff --git a/kde-modules/prefix.sh.cmake b/kde-modules/prefix.sh.cmake
+index 2d75471a..43b41e9f 100644
+--- a/kde-modules/prefix.sh.cmake
++++ b/kde-modules/prefix.sh.cmake
+@@ -14,5 +14,3 @@ export QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2
+ export MANPATH=@KDE_INSTALL_FULL_DATADIR@/man:${MANPATH:-/usr/local/share/man:/usr/share/man}
+ 
+ export SASL_PATH=@KDE_INSTALL_FULL_LIBDIR@/sasl2:${SASL_PATH:-/usr/@CMAKE_INSTALL_LIBDIR@/sasl2}
+-
+-@SH_EXPORT_PYTHONPATH@
+diff --git a/kde-modules/prefix.sh.fish.cmake b/kde-modules/prefix.sh.fish.cmake
+index 3cb4c4a0..d59c1b87 100644
+--- a/kde-modules/prefix.sh.fish.cmake
++++ b/kde-modules/prefix.sh.fish.cmake
+@@ -20,5 +20,3 @@ set -x --path QT_PLUGIN_PATH "@KDE_INSTALL_FULL_QTPLUGINDIR@" $QT_PLUGIN_PATH
+ set -x --path QML2_IMPORT_PATH "@KDE_INSTALL_FULL_QMLDIR@" $QML2_IMPORT_PATH
+ 
+ set -x --path QT_QUICK_CONTROLS_STYLE_PATH "@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/" $QT_QUICK_CONTROLS_STYLE_PATH
+-
+-@FISH_EXPORT_PYTHONPATH@
+-- 
+2.54.0
+

diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index 8421a34..edc5647 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -10,10 +10,10 @@
 
 Name:    extra-cmake-modules
 Summary: Additional modules for CMake build system
-Version: 6.25.0
+Version: 6.28.0
 Release: 1%{?dist}
-# Automatically converted from old format: BSD - review is highly recommended.
-License: LicenseRef-Callaway-BSD
+# kde-modules/clang-format.cmake is MIT
+License: BSD-3-Clause AND BSD-2-Clause AND MIT
 URL:     https://api.kde.org/ecm/
 Source0: http://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz
 Source1: http://download.kde.org/%{stable_kf6}/frameworks/%{majmin_ver_kf6}/%{framework}-%{version}.tar.xz.sig
@@ -23,6 +23,9 @@ BuildArch:      noarch
 # do not unconditionally link in base/core libpoppler library
 Patch2: extra-cmake-modules-5.39.0-poppler_overlinking.patch
 
+# test
+Patch3: 0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
+
 ## downstream patches
 
 BuildRequires: kf6-rpm-macros
@@ -93,6 +96,18 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_vpath_builddir} ||:
 
 
 %changelog
+* Sat Jul 04 2026 Steve Cossette <farchord@gmail.com> - 6.28.0-1
+- 6.28.0
+
+* Fri Jun 05 2026 Steve Cossette <farchord@gmail.com> - 6.27.0-1
+- 6.27.0
+
+* Thu May 14 2026 Steve Cossette <farchord@gmail.com> - 6.26.0-2
+- Fix for kde packages not being able to find python
+
+* Fri May 01 2026 Steve Cossette <farchord@gmail.com> - 6.26.0-1
+- 6.26.0
+
 * Thu Apr 09 2026 Steve Cossette <farchord@gmail.com> - 6.25.0-1
 - 6.25.0
 

diff --git a/sources b/sources
index 9cce9d3..a0fa533 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (extra-cmake-modules-6.25.0.tar.xz) = 5a2954b928978c3fe6e233e0358eebc0cbcb477d76233ef11e7e76d697d28063fb97c347943e5d40fe2fe8123aca79814c969144f073cfcb19dcaacb94e8d73a
-SHA512 (extra-cmake-modules-6.25.0.tar.xz.sig) = 91c713e098f99155879a12a96d22937c6ee8517de9a8fd39c2b6a605f1d5d9b58647da524d8c9f01e3a8882899618ed021e87a48ec9a4cee1e861310da6da32a
+SHA512 (extra-cmake-modules-6.28.0.tar.xz) = baae125340e3c7dfde655825f97011e0a07a2369b172a56ac73f3379b5ac67bbcb37342a528527bbf8271421506c2a683a8d5bd106502bc48a18d28a8dcd21af
+SHA512 (extra-cmake-modules-6.28.0.tar.xz.sig) = 6307066b492ae8959d9373553ddb604bed450bd709146d12f7fad0dea21afc5b7d3cf3d6c5bfeee23dd7e60e2e12ff959b7a0ba5dee33232c14c268ab8c01ee2

diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index abb257a..edc5647 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -1,9 +1,10 @@
 %global framework extra-cmake-modules
 
 # uncomment to enable bootstrap mode
-#global bootstrap 1
+%global bootstrap 1
 
 %if !0%{?bootstrap}
+%global docs 1
 %global tests 1
 %endif
 
@@ -29,15 +30,18 @@ Patch3: 0001-Revert-Add-PYTHONPATH-to-prefix.sh-if-python-is-avai.patch
 
 BuildRequires: kf6-rpm-macros
 BuildRequires: make
+%if 0%{?docs}
 # qcollectiongenerator
 BuildRequires: qt5-qttools-devel
 # sphinx-build
 BuildRequires: python3-sphinx
 BuildRequires: python3-sphinxcontrib-qthelp
 %global sphinx_build -DSphinx_BUILD_EXECUTABLE:PATH=%{_bindir}/sphinx-build-3
-
+%endif
+%if 0%{?tests}
 # Qt5Core is needed for tests to run properly (As-of 5.246.1).
 BuildRequires: pkgconfig(Qt5Core)
+%endif
 BuildRequires: pkgconfig(Qt6Core)
 %if 0%{?fedora} || 0%{?rhel} < 10
 Requires: (kf5-rpm-macros if qt5-qtbase-devel)
@@ -60,7 +64,7 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %cmake_kf6 \
   -DBUILD_MAN_DOCS:BOOL=OFF \
   -DBUILD_HTML_DOCS:BOOL=OFF \
-  -DBUILD_QTHELP_DOCS:BOOL=ON \
+  -DBUILD_QTHELP_DOCS:BOOL=%{?docs:ON}%{!?docs:OFF} \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} \
   %{?sphinx_build}
 %cmake_build
@@ -68,9 +72,11 @@ Developer Documentation files for %{name} for use with KDevelop or QtCreator.
 %install
 %cmake_install
 
+%if 0%{?docs}
 # move to qt6 docdir so it shows up in Qt Creator by default
 mkdir %{buildroot}%{_qt6_docdir}
 mv %{buildroot}%{_kf6_docdir}/ECM/*.qch %{buildroot}%{_qt6_docdir}/
+%endif
 
 %check
 %if 0%{?tests}
@@ -83,8 +89,10 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_vpath_builddir} ||:
 %license LICENSES/*.txt
 %{_datadir}/ECM/
 
+%if 0%{?docs}
 %files doc
 %{_qt6_docdir}/*.qch
+%endif
 
 
 %changelog