public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/extra-cmake-modules] epel10.3: Merge branch f44 into epel10
Date: Mon, 14 Sep 2026 16:45:28 GMT	[thread overview]
Message-ID: <178940432836.1.17775951529261488394.rpms-extra-cmake-modules-d10a13a10ccd@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/extra-cmake-modules
Branch : epel10.3
Commit : d10a13a10ccd6551cb54667a9491b733fbe73e8e
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-09-11T09:53:02-07:00
Stats  : +23/-6 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/extra-cmake-modules/c/d10a13a10ccd6551cb54667a9491b733fbe73e8e?branch=epel10.3

Log:
Merge branch f44 into epel10

---
diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index edc5647..9b65159 100644
--- a/extra-cmake-modules.spec
+++ b/extra-cmake-modules.spec
@@ -10,7 +10,7 @@
 
 Name:    extra-cmake-modules
 Summary: Additional modules for CMake build system
-Version: 6.28.0
+Version: 6.30.0
 Release: 1%{?dist}
 # kde-modules/clang-format.cmake is MIT
 License: BSD-3-Clause AND BSD-2-Clause AND MIT
@@ -96,6 +96,15 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_vpath_builddir} ||:
 
 
 %changelog
+* Fri Sep 04 2026 Steve Cossette <farchord@gmail.com> - 6.30.0-1
+- 6.30.0
+
+* Fri Aug 07 2026 Steve Cossette <farchord@gmail.com> - 6.29.0-1
+- 6.29.0
+
+* Wed Jul 15 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.28.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Sat Jul 04 2026 Steve Cossette <farchord@gmail.com> - 6.28.0-1
 - 6.28.0
 

diff --git a/sources b/sources
index a0fa533..699620d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (extra-cmake-modules-6.28.0.tar.xz) = baae125340e3c7dfde655825f97011e0a07a2369b172a56ac73f3379b5ac67bbcb37342a528527bbf8271421506c2a683a8d5bd106502bc48a18d28a8dcd21af
-SHA512 (extra-cmake-modules-6.28.0.tar.xz.sig) = 6307066b492ae8959d9373553ddb604bed450bd709146d12f7fad0dea21afc5b7d3cf3d6c5bfeee23dd7e60e2e12ff959b7a0ba5dee33232c14c268ab8c01ee2
+SHA512 (extra-cmake-modules-6.30.0.tar.xz) = 7fe71f81bba3d3ff4f4a69cfc9ea9d1759f700be0ecd19fd049e0b0046bdb41f32c37babd60d40cd81c8d78681706a5eef7df42888236fd2c158592b28a788aa
+SHA512 (extra-cmake-modules-6.30.0.tar.xz.sig) = eb9af80cb07e247f0d23c3caa8319237cbf3f7dd09c27266a8953707e0fd8a6bfa59a7461a74965bb58d8e828bff075378118c6f51fd91d40767066d1f76cbb0

diff --git a/extra-cmake-modules.spec b/extra-cmake-modules.spec
index 58eccfd..9b65159 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

                 reply	other threads:[~2026-09-14 16:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178940432836.1.17775951529261488394.rpms-extra-cmake-modules-d10a13a10ccd@fedoraproject.org \
    --to=tdawson@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox