Skip to content

Commit 1c99818

Browse files
author
CKI KWF Bot
committed
Merge: redhat/kernel.spec: make python3-perf glob more specific
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1624 JIRA: https://issues.redhat.com/browse/RHEL-119658 Upstream Status: ARK commit 21ff03e3f35bfa42a0f86aa4eba356d56608c88e commit 21ff03e3f35bfa42a0f86aa4eba356d56608c88e Author: Jan Stancek <jstancek@redhat.com> Date: Fri Oct 17 08:31:25 2025 +0200 redhat/kernel.spec: make python3-perf glob more specific With introduction of pylibcpupower, python3-perf now includes it as well: kernel-tools-libs-devel-6.12.0-138.el10.x86_64 provides /usr/lib64/python3.12/site-packages/_raw_pylibcpupower.so which is also provided by python3-perf-6.12.0-136.el10.x86_64 kernel-tools-libs-devel-6.12.0-138.el10.x86_64 provides /usr/lib64/python3.12/site-packages/raw_pylibcpupower.py which is also provided by python3-perf-6.12.0-136.el10.x86_64 Make the glob for python3-perf more specific, so it includes only perf-related files. Also add missing pycache entry for raw_pylibcpupower. Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Eder Zulian <ezulian@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 613ec51 + 66da0ea commit 1c99818

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

redhat/kernel.spec.template

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4047,7 +4047,7 @@ fi\
40474047
%{_docdir}/perf-tip/tips.txt
40484048

40494049
%files -n python3-perf
4050-
%{python3_sitearch}/*
4050+
%{python3_sitearch}/perf*
40514051

40524052
%if %{with_debuginfo}
40534053
%files -f perf-debuginfo.list -n perf-debuginfo
@@ -4155,6 +4155,8 @@ fi\
41554155
# libcpupower Python bindings
41564156
%{python3_sitearch}/_raw_pylibcpupower.so
41574157
%{python3_sitearch}/raw_pylibcpupower.py
4158+
%{python3_sitearch}/__pycache__/raw_pylibcpupower*
4159+
41584160
%endif
41594161
%if %{with_ynl}
41604162
%{_libdir}/libynl*

0 commit comments

Comments
 (0)