public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/abrt] update-2.17.9-f44: Use correct paths for installed Python modules
Date: Mon, 03 Aug 2026 11:05:13 GMT [thread overview]
Message-ID: <178575511314.1.9920149388746889534.rpms-abrt-cbad6eeeab7b@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/abrt
Branch : update-2.17.9-f44
Commit : cbad6eeeab7b5aef09cc4cf142ad3e8e21b0e6d1
Author : Matěj Grabovský <mgrabovs@redhat.com>
Date : 2019-10-16T14:02:50+02:00
Stats : +105/-7 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/abrt/c/cbad6eeeab7b5aef09cc4cf142ad3e8e21b0e6d1?branch=update-2.17.9-f44
Log:
Use correct paths for installed Python modules
This patch is pulled from upstream.
---
diff --git a/0001-python-Use-correct-paths-for-installed-modules.patch b/0001-python-Use-correct-paths-for-installed-modules.patch
new file mode 100644
index 0000000..d12bb22
--- /dev/null
+++ b/0001-python-Use-correct-paths-for-installed-modules.patch
@@ -0,0 +1,96 @@
+From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= <mgrabovs@redhat.com>
+Date: Wed, 16 Oct 2019 11:27:54 +0200
+Subject: [PATCH] python: Use correct paths for installed modules
+
+Non-compiled (without C bits) Python modules should be installed into
+architecture-independent directory (/usr/lib/python3.x/site-packages
+in the case of Fedora).
+
+This commit fixes both
+* the spec file, where %{python3_sitelib} should be used rather than
+ %{python3_sitearch} which is to be used for compiled extensions; and
+* the automake scripts, where $(pythondir) should be used in place of
+ $(pyexecdir) for the same reason.
+
+This is a follow-up to 20dcf7fb4.
+---
+ abrt.spec.in | 14 +++++++-------
+ src/cli/abrtcli/Makefile.am | 2 +-
+ src/cli/abrtcli/cli/Makefile.am | 2 +-
+ src/hooks/Makefile.am | 2 +-
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/abrt.spec.in b/abrt.spec.in
+index 1c6c48ad..fe0b2278 100644
+--- a/abrt.spec.in
++++ b/abrt.spec.in
+@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || :
+ %{_journalcatalogdir}/python3_abrt.catalog
+ %config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf
+ %{_mandir}/man5/python3_event.conf.5*
+-%{python3_sitearch}/abrt3.pth
+-%{python3_sitearch}/abrt_exception_handler3.py
+-%{python3_sitearch}/__pycache__/abrt_exception_handler3.*
++%{python3_sitelib}/abrt3.pth
++%{python3_sitelib}/abrt_exception_handler3.py
++%{python3_sitelib}/__pycache__/abrt_exception_handler3.*
+
+ %files -n python3-abrt-container-addon
+-%{python3_sitearch}/abrt3_container.pth
+-%{python3_sitearch}/abrt_exception_handler3_container.py
+-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.*
++%{python3_sitelib}/abrt3_container.pth
++%{python3_sitelib}/abrt_exception_handler3_container.py
++%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.*
+ %endif # with python3
+
+ %files plugin-sosreport
+@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || :
+ %config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion
+ %{_bindir}/abrt
+ %{_bindir}/abrt-cli
+-%{python3_sitearch}/abrtcli/
++%{python3_sitelib}/abrtcli/
+ %{_mandir}/man1/abrt.1*
+ %{_mandir}/man1/abrt-cli.1*
+ %endif # with python3
+diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am
+index d11355a2..a599d0b5 100644
+--- a/src/cli/abrtcli/Makefile.am
++++ b/src/cli/abrtcli/Makefile.am
+@@ -9,7 +9,7 @@ PYFILES= \
+ utils.py
+
+ abrtcli_PYTHON = $(PYFILES)
+-abrtclidir = $(pyexecdir)/abrtcli
++abrtclidir = $(pythondir)/abrtcli
+
+ config.py: config.py.in
+ sed -e s,\@LOCALE_DIR\@,$(localedir),g \
+diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am
+index 17ff216b..c796074d 100644
+--- a/src/cli/abrtcli/cli/Makefile.am
++++ b/src/cli/abrtcli/cli/Makefile.am
+@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \
+ retrace.py \
+ status.py
+
+-abrtclicommandsdir = $(pyexecdir)/abrtcli/cli
++abrtclicommandsdir = $(pythondir)/abrtcli/cli
+diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
+index 6e35887f..bdef0329 100644
+--- a/src/hooks/Makefile.am
++++ b/src/hooks/Makefile.am
+@@ -35,7 +35,7 @@ EXTRA_DIST = \
+ ALL_DEPENDENCES =
+
+ if BUILD_PYTHON3
+-py3hookdir = $(pyexecdir)
++py3hookdir = $(pythondir)
+ dist_pluginsconf_DATA += python3.conf
+ ALL_DEPENDENCES += abrt_exception_handler3.py
+
+--
+2.21.0
+
diff --git a/abrt.spec b/abrt.spec
index 84963b2..79d8b61 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -54,6 +54,8 @@ License: GPLv2+
URL: https://abrt.readthedocs.org/
Source: https://github.com/abrt/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0: 0001-python-Use-correct-paths-for-installed-modules.patch
+
BuildRequires: git-core
BuildRequires: %{dbus_devel}
BuildRequires: hostname
@@ -939,14 +941,14 @@ killall abrt-dbus >/dev/null 2>&1 || :
%{_journalcatalogdir}/python3_abrt.catalog
%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf
%{_mandir}/man5/python3_event.conf.5*
-%{python3_sitearch}/abrt3.pth
-%{python3_sitearch}/abrt_exception_handler3.py
-%{python3_sitearch}/__pycache__/abrt_exception_handler3.*
+%{python3_sitelib}/abrt3.pth
+%{python3_sitelib}/abrt_exception_handler3.py
+%{python3_sitelib}/__pycache__/abrt_exception_handler3.*
%files -n python3-abrt-container-addon
-%{python3_sitearch}/abrt3_container.pth
-%{python3_sitearch}/abrt_exception_handler3_container.py
-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.*
+%{python3_sitelib}/abrt3_container.pth
+%{python3_sitelib}/abrt_exception_handler3_container.py
+%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.*
%endif # with python3
%files plugin-sosreport
@@ -963,7 +965,7 @@ killall abrt-dbus >/dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion
%{_bindir}/abrt
%{_bindir}/abrt-cli
-%{python3_sitearch}/abrtcli/
+%{python3_sitelib}/abrtcli/
%{_mandir}/man1/abrt.1*
%{_mandir}/man1/abrt-cli.1*
%endif # with python3
reply other threads:[~2026-08-03 11:05 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=178575511314.1.9920149388746889534.rpms-abrt-cbad6eeeab7b@fedoraproject.org \
--to=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