From 45ed9369f5a54b9e8a4ff7bfa4288a93631193c2 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 30 Nov 2020 19:14:29 -0800 Subject: [PATCH] Fix 32 bit arm install issue. Fixes bug #1894261 --- 2579.patch | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++++ koji.spec | 12 +++-- 2 files changed, 148 insertions(+), 4 deletions(-) create mode 100644 2579.patch diff --git a/2579.patch b/2579.patch new file mode 100644 index 0000000..e4df9f1 --- /dev/null +++ b/2579.patch @@ -0,0 +1,140 @@ +From 66ba134859f268d36af6bfedf8e851959b06dd2d Mon Sep 17 00:00:00 2001 +From: Michal Privoznik +Date: Nov 27 2020 09:00:52 +0000 +Subject: Install into /usr/lib rather than /usr/lib64/ + + +In koji-1.22.0-129-g0ef3c751 I've changed the way how +site-packages directory is obtained. What I did not realize back +then is there can be multilib systems which will not search for +packages in /usr/lib64. But 64bit systems do look into /usr/lib. +Therefore, let's pick the location where both systems work. + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1894261 +Fixes: #2578 +https://pagure.io/koji/issue/2578 +Signed-off-by: Michal Privoznik + +--- + +diff --git a/cli/Makefile b/cli/Makefile +index ddaeba3..122a23f 100644 +--- a/cli/Makefile ++++ b/cli/Makefile +@@ -1,7 +1,7 @@ + SUBDIRS=koji_cli + + PACKAGE = $(shell basename `pwd`) +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + FILES = koji + +diff --git a/cli/koji_cli/Makefile b/cli/koji_cli/Makefile +index fd66929..62b8b53 100644 +--- a/cli/koji_cli/Makefile ++++ b/cli/koji_cli/Makefile +@@ -1,7 +1,7 @@ + PYFILES = $(wildcard *.py) + + PACKAGE = $(shell basename `pwd`) +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + _default: + @echo "nothing to make. try make install" +diff --git a/hub/Makefile b/hub/Makefile +index 6881f63..a44e1c4 100644 +--- a/hub/Makefile ++++ b/hub/Makefile +@@ -1,6 +1,6 @@ + PACKAGE = $(shell basename `pwd`) + PYFILES = $(wildcard *.py) +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + SERVERDIR = /usr/share/koji-hub + PYFILES = $(wildcard *.py) +diff --git a/koji.spec b/koji.spec +index 78d1863..7e0b6e7 100644 +--- a/koji.spec ++++ b/koji.spec +@@ -62,7 +62,7 @@ + # not yet to RHEL proper. + # https://bugzilla.redhat.com/show_bug.cgi?id=1307190 + %{!?__python2: %global __python2 /usr/bin/python2} +-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} ++%{!?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(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}}} +@@ -451,19 +451,19 @@ rm -rf $RPM_BUILD_ROOT + + %if 0%{py2_support} + %files -n python2-%{name} +-%{python2_sitearch}/%{name} +-%{python2_sitearch}/koji_cli ++%{python2_sitelib}/%{name} ++%{python2_sitelib}/koji_cli + %endif + + %if 0%{py3_support} + %files -n python%{python3_pkgversion}-koji +-%{python3_sitearch}/%{name} +-%{python3_sitearch}/koji_cli ++%{python3_sitelib}/%{name} ++%{python3_sitelib}/koji_cli + %endif + + %if 0%{py2_support} + %files -n python2-%{name}-cli-plugins +-%{python2_sitearch}/koji_cli_plugins ++%{python2_sitelib}/koji_cli_plugins + # we don't have config files for default plugins yet + #%%dir %%{_sysconfdir}/koji/plugins + #%%config(noreplace) %%{_sysconfdir}/koji/plugins/*.conf +@@ -471,7 +471,7 @@ rm -rf $RPM_BUILD_ROOT + + %if 0%{py3_support} + %files -n python%{python3_pkgversion}-%{name}-cli-plugins +-%{python3_sitearch}/koji_cli_plugins ++%{python3_sitelib}/koji_cli_plugins + # we don't have config files for default plugins yet + #%%dir %%{_sysconfdir}/koji/plugins + #%%config(noreplace) %%{_sysconfdir}/koji/plugins/*.conf +diff --git a/koji/Makefile b/koji/Makefile +index 2b6f3d4..0064cdd 100644 +--- a/koji/Makefile ++++ b/koji/Makefile +@@ -2,7 +2,7 @@ PACKAGE = $(shell basename `pwd`) + PYFILES = $(wildcard *.py) + PYSCRIPTS = + SUBDIRS = +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + _default: + @echo "nothing to make. try make install" +diff --git a/plugins/Makefile b/plugins/Makefile +index 10f71e2..6ea1d2a 100644 +--- a/plugins/Makefile ++++ b/plugins/Makefile +@@ -1,4 +1,4 @@ +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + CLIPLUGINDIR = $(PKGDIR)/koji_cli_plugins + HUBPLUGINDIR = /usr/lib/koji-hub-plugins +diff --git a/www/lib/kojiweb/Makefile b/www/lib/kojiweb/Makefile +index 8ea3759..5fa67c0 100644 +--- a/www/lib/kojiweb/Makefile ++++ b/www/lib/kojiweb/Makefile +@@ -1,6 +1,6 @@ + PACKAGE = $(shell basename `pwd`) + PYFILES = $(wildcard *.py) +-PKGDIR = $(shell $(PYTHON) -c "import site; print(site.getsitepackages()[0])")/$(PACKAGE) ++PKGDIR = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")/$(PACKAGE) + + SERVERDIR = /kojiweb + FILES = $(wildcard *.py *.chtml) + diff --git a/koji.spec b/koji.spec index 7f39f63..4c94246 100644 --- a/koji.spec +++ b/koji.spec @@ -9,7 +9,7 @@ Name: koji Version: 1.23.0 -Release: 1%{?dist} +Release: 2%{?dist} # the included arch lib from yum's rpmUtils is GPLv2+ License: LGPLv2 and GPLv2+ Summary: Build system tools @@ -17,6 +17,7 @@ URL: https://pagure.io/koji/ Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2 # Patches already upstream +Patch1: https://pagure.io/koji/pull-request/2579.patch # Not upstreamable Patch100: fedora-config.patch @@ -229,11 +230,11 @@ done %doc docs Authors COPYING LGPL %files -n python%{python3_pkgversion}-koji -%{python3_sitearch}/%{name} -%{python3_sitearch}/koji_cli +%{python3_sitelib}/%{name} +%{python3_sitelib}/koji_cli %files -n python%{python3_pkgversion}-%{name}-cli-plugins -%{python3_sitearch}/koji_cli_plugins +%{python3_sitelib}/koji_cli_plugins # we don't have config files for default plugins yet #%%dir %%{_sysconfdir}/koji/plugins #%%config(noreplace) %%{_sysconfdir}/koji/plugins/*.conf @@ -337,6 +338,9 @@ done %systemd_postun kojira.service %changelog +* Mon Nov 30 2020 Kevin Fenzi - 1.23.0-2 +- Fix 32 bit arm install issue. Fixes bug #1894261 + * Thu Oct 22 2020 Kevin Fenzi - 1.23.0-1 - Update to 1.23.0. Fixes bug #1890435