|
 |
bdb580f |
From 57c0042ead87249bed5964eeec45b97543674060 Mon Sep 17 00:00:00 2001
|
|
|
bdb580f |
From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= <mgrabovs@redhat.com>
|
|
|
bdb580f |
Date: Wed, 16 Oct 2019 11:27:54 +0200
|
|
|
bdb580f |
Subject: [PATCH] python: Use correct paths for installed modules
|
|
|
bdb580f |
|
|
|
bdb580f |
Non-compiled (without C bits) Python modules should be installed into
|
|
|
bdb580f |
architecture-independent directory (/usr/lib/python3.x/site-packages
|
|
|
bdb580f |
in the case of Fedora).
|
|
|
bdb580f |
|
|
|
bdb580f |
This commit fixes both
|
|
|
bdb580f |
* the spec file, where %{python3_sitelib} should be used rather than
|
|
|
bdb580f |
%{python3_sitearch} which is to be used for compiled extensions; and
|
|
|
bdb580f |
* the automake scripts, where $(pythondir) should be used in place of
|
|
|
bdb580f |
$(pyexecdir) for the same reason.
|
|
|
bdb580f |
|
|
|
bdb580f |
This is a follow-up to 20dcf7fb4.
|
|
|
bdb580f |
---
|
|
|
bdb580f |
abrt.spec.in | 14 +++++++-------
|
|
|
bdb580f |
src/cli/abrtcli/Makefile.am | 2 +-
|
|
|
bdb580f |
src/cli/abrtcli/cli/Makefile.am | 2 +-
|
|
|
bdb580f |
src/hooks/Makefile.am | 2 +-
|
|
|
bdb580f |
4 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
bdb580f |
|
|
|
bdb580f |
diff --git a/abrt.spec.in b/abrt.spec.in
|
|
|
bdb580f |
index 1c6c48ad..fe0b2278 100644
|
|
|
bdb580f |
--- a/abrt.spec.in
|
|
|
bdb580f |
+++ b/abrt.spec.in
|
|
|
bdb580f |
@@ -935,14 +935,14 @@ killall abrt-dbus >/dev/null 2>&1 || :
|
|
|
bdb580f |
%{_journalcatalogdir}/python3_abrt.catalog
|
|
|
bdb580f |
%config(noreplace) %{_sysconfdir}/libreport/plugins/catalog_python3_format.conf
|
|
|
bdb580f |
%{_mandir}/man5/python3_event.conf.5*
|
|
|
bdb580f |
-%{python3_sitearch}/abrt3.pth
|
|
|
bdb580f |
-%{python3_sitearch}/abrt_exception_handler3.py
|
|
|
bdb580f |
-%{python3_sitearch}/__pycache__/abrt_exception_handler3.*
|
|
|
bdb580f |
+%{python3_sitelib}/abrt3.pth
|
|
|
bdb580f |
+%{python3_sitelib}/abrt_exception_handler3.py
|
|
|
bdb580f |
+%{python3_sitelib}/__pycache__/abrt_exception_handler3.*
|
|
|
bdb580f |
|
|
|
bdb580f |
%files -n python3-abrt-container-addon
|
|
|
bdb580f |
-%{python3_sitearch}/abrt3_container.pth
|
|
|
bdb580f |
-%{python3_sitearch}/abrt_exception_handler3_container.py
|
|
|
bdb580f |
-%{python3_sitearch}/__pycache__/abrt_exception_handler3_container.*
|
|
|
bdb580f |
+%{python3_sitelib}/abrt3_container.pth
|
|
|
bdb580f |
+%{python3_sitelib}/abrt_exception_handler3_container.py
|
|
|
bdb580f |
+%{python3_sitelib}/__pycache__/abrt_exception_handler3_container.*
|
|
|
bdb580f |
%endif # with python3
|
|
|
bdb580f |
|
|
|
bdb580f |
%files plugin-sosreport
|
|
|
bdb580f |
@@ -959,7 +959,7 @@ killall abrt-dbus >/dev/null 2>&1 || :
|
|
|
bdb580f |
%config(noreplace) %{_sysconfdir}/bash_completion.d/abrt.bash_completion
|
|
|
bdb580f |
%{_bindir}/abrt
|
|
|
bdb580f |
%{_bindir}/abrt-cli
|
|
|
bdb580f |
-%{python3_sitearch}/abrtcli/
|
|
|
bdb580f |
+%{python3_sitelib}/abrtcli/
|
|
|
bdb580f |
%{_mandir}/man1/abrt.1*
|
|
|
bdb580f |
%{_mandir}/man1/abrt-cli.1*
|
|
|
bdb580f |
%endif # with python3
|
|
|
bdb580f |
diff --git a/src/cli/abrtcli/Makefile.am b/src/cli/abrtcli/Makefile.am
|
|
|
bdb580f |
index d11355a2..a599d0b5 100644
|
|
|
bdb580f |
--- a/src/cli/abrtcli/Makefile.am
|
|
|
bdb580f |
+++ b/src/cli/abrtcli/Makefile.am
|
|
|
bdb580f |
@@ -9,7 +9,7 @@ PYFILES= \
|
|
|
bdb580f |
utils.py
|
|
|
bdb580f |
|
|
|
bdb580f |
abrtcli_PYTHON = $(PYFILES)
|
|
|
bdb580f |
-abrtclidir = $(pyexecdir)/abrtcli
|
|
|
bdb580f |
+abrtclidir = $(pythondir)/abrtcli
|
|
|
bdb580f |
|
|
|
bdb580f |
config.py: config.py.in
|
|
|
bdb580f |
sed -e s,\@LOCALE_DIR\@,$(localedir),g \
|
|
|
bdb580f |
diff --git a/src/cli/abrtcli/cli/Makefile.am b/src/cli/abrtcli/cli/Makefile.am
|
|
|
bdb580f |
index 17ff216b..c796074d 100644
|
|
|
bdb580f |
--- a/src/cli/abrtcli/cli/Makefile.am
|
|
|
bdb580f |
+++ b/src/cli/abrtcli/cli/Makefile.am
|
|
|
bdb580f |
@@ -10,4 +10,4 @@ abrtclicommands_PYTHON = \
|
|
|
bdb580f |
retrace.py \
|
|
|
bdb580f |
status.py
|
|
|
bdb580f |
|
|
|
bdb580f |
-abrtclicommandsdir = $(pyexecdir)/abrtcli/cli
|
|
|
bdb580f |
+abrtclicommandsdir = $(pythondir)/abrtcli/cli
|
|
|
bdb580f |
diff --git a/src/hooks/Makefile.am b/src/hooks/Makefile.am
|
|
|
bdb580f |
index 6e35887f..bdef0329 100644
|
|
|
bdb580f |
--- a/src/hooks/Makefile.am
|
|
|
bdb580f |
+++ b/src/hooks/Makefile.am
|
|
|
bdb580f |
@@ -35,7 +35,7 @@ EXTRA_DIST = \
|
|
|
bdb580f |
ALL_DEPENDENCES =
|
|
|
bdb580f |
|
|
|
bdb580f |
if BUILD_PYTHON3
|
|
|
bdb580f |
-py3hookdir = $(pyexecdir)
|
|
|
bdb580f |
+py3hookdir = $(pythondir)
|
|
|
bdb580f |
dist_pluginsconf_DATA += python3.conf
|
|
|
bdb580f |
ALL_DEPENDENCES += abrt_exception_handler3.py
|
|
|
bdb580f |
|
|
|
bdb580f |
--
|
|
|
bdb580f |
2.21.0
|
|
|
bdb580f |
|