public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Neal Gompa <ngompa@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/kf6] f45: Add KDE_DOCS variable to build/install macros
Date: Mon, 31 Aug 2026 17:59:02 GMT [thread overview]
Message-ID: <178819914288.1.5930512804543712215.rpms-kf6-2dd84377a9ba@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/kf6
Branch : f45
Commit : 2dd84377a9ba4ad244598b3f13b01165381c2451
Author : Neal Gompa <ngompa@fedoraproject.org>
Date : 2026-08-31T13:57:47-04:00
Stats : +7/-2 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/kf6/c/2dd84377a9ba4ad244598b3f13b01165381c2451?branch=f45
Log:
Add KDE_DOCS variable to build/install macros
---
diff --git a/kf6.spec b/kf6.spec
index 156ea43..9ca458a 100644
--- a/kf6.spec
+++ b/kf6.spec
@@ -3,7 +3,7 @@
Name: kf6
# This version MUST remain in sync with KF6 versions!
Version: 6.29.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Filesystem and RPM macros for KDE Frameworks 6
License: BSD-3-Clause
URL: http://www.kde.org
@@ -95,6 +95,9 @@ sed -i \
%{_rpmconfigdir}/macros.d/macros.kf6
%changelog
+* Mon Aug 31 2026 Neal Gompa <ngompa@fedoraproject.org> - 6.29.0-2
+- Add KDE_DOCS variable to build/install macros
+
* Fri Aug 07 2026 Steve Cossette <farchord@gmail.com> - 6.29.0-1
- 6.29.0
diff --git a/macros.kf6 b/macros.kf6
index 810f1b4..9ff0fea 100644
--- a/macros.kf6
+++ b/macros.kf6
@@ -19,7 +19,7 @@
%undefine __cmake_in_source_build \
QTDIR="%{_qt6_prefix}" ; export QTDIR ; \
PATH="%{_qt6_bindir}:$PATH" ; export PATH ; \
- KDE_DOCS="/usr/share/doc/qt6/kde-qdoc-common" ; export KDE_DOCS ; \
+ KDE_DOCS="%{_datadir}/doc/qt6/kde-qdoc-common" ; export KDE_DOCS ; \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}}" ; export FFLAGS ; \
@@ -57,6 +57,7 @@
%cmake_build_kf6 \\\
%cmake_build \
+ KDE_DOCS="%{_datadir}/doc/qt6/kde-qdoc-common" ; export KDE_DOCS ; \
%cmake_build -t prepare_docs \
%cmake_build -t generate_docs \
%cmake_build -t generate_qch
@@ -64,6 +65,7 @@
%cmake_install_kf6 \\\
%cmake_install \
DESTDIR=%{buildroot} ; export DESTDIR ; \
+ KDE_DOCS="%{_datadir}/doc/qt6/kde-qdoc-common" ; export KDE_DOCS ; \
%cmake_build -t install_html_docs \
%cmake_build -t install_qch_docs
reply other threads:[~2026-08-31 17:59 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=178819914288.1.5930512804543712215.rpms-kf6-2dd84377a9ba@fedoraproject.org \
--to=ngompa@fedoraproject.org \
--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