| |
@@ -58,7 +58,7 @@
|
| |
# not yet to RHEL proper.
|
| |
# https://bugzilla.redhat.com/show_bug.cgi?id=1307190
|
| |
%{!?__python2: %global __python2 /usr/bin/python2}
|
| |
- %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
| |
+ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
|
| |
%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
|
| |
%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
|
| |
%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
|
| |
@@ -472,19 +472,19 @@
|
| |
|
| |
%if 0%{py2_support}
|
| |
%files -n python2-%{name}
|
| |
- %{python2_sitelib}/%{name}
|
| |
- %{python2_sitelib}/koji_cli
|
| |
+ %{python2_sitearch}/%{name}
|
| |
+ %{python2_sitearch}/koji_cli
|
| |
%endif
|
| |
|
| |
%if 0%{py3_support}
|
| |
%files -n python%{python3_pkgversion}-koji
|
| |
- %{python3_sitelib}/%{name}
|
| |
- %{python3_sitelib}/koji_cli
|
| |
+ %{python3_sitearch}/%{name}
|
| |
+ %{python3_sitearch}/koji_cli
|
| |
%endif
|
| |
|
| |
%if 0%{py2_support}
|
| |
%files -n python2-%{name}-cli-plugins
|
| |
- %{python2_sitelib}/koji_cli_plugins
|
| |
+ %{python2_sitearch}/koji_cli_plugins
|
| |
# we don't have config files for default plugins yet
|
| |
#%%dir %%{_sysconfdir}/koji/plugins
|
| |
#%%config(noreplace) %%{_sysconfdir}/koji/plugins/*.conf
|
| |
@@ -492,7 +492,7 @@
|
| |
|
| |
%if 0%{py3_support}
|
| |
%files -n python%{python3_pkgversion}-%{name}-cli-plugins
|
| |
- %{python3_sitelib}/koji_cli_plugins
|
| |
+ %{python3_sitearch}/koji_cli_plugins
|
| |
# we don't have config files for default plugins yet
|
| |
#%%dir %%{_sysconfdir}/koji/plugins
|
| |
#%%config(noreplace) %%{_sysconfdir}/koji/plugins/*.conf
|
| |
So far, in all Makefiles we have a complicated way to construct
PKGDIR path which is used to install python modules into.
Firstly, python version is obtained, and then system prefix and
these are then used to construct the PKGDIR path. Well, we can do
better. We can use 'site.getsitepackages()[0]' to obtain exactly
the path we are after.
This also fixes the problem on distributions which have split
/usr/lib and /usr/lib64 directories, because with the way we are
constructing the PKGDIR path we assume that the directories are
the same (or one is a symlink to another). Well, that is not
always the case.
Signed-off-by: Michal Privoznik mprivozn@redhat.com