From 0c2f0ea7c5fd95279d0466c784be541899fdb588 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Mar 04 2019 14:37:19 +0000 Subject: PR#1317: fix deps for utils/vm subpackages on py3 Merges #1317 https://pagure.io/koji/pull-request/1317 Fixes: #1316 https://pagure.io/koji/issue/1316 utils and vm subpackages have py2 deps when built for py3 --- diff --git a/koji.spec b/koji.spec index 53b2aed..022e2aa 100644 --- a/koji.spec +++ b/koji.spec @@ -320,8 +320,7 @@ tasks that come through the Koji system. Summary: Koji virtual machine management daemon Group: Applications/System License: LGPLv2 -# we need the python2 lib here -Requires: python2-%{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %if %{use_systemd} Requires(post): systemd Requires(preun): systemd @@ -332,8 +331,13 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service %endif +%if 0%{py3_support} > 1 +Requires: python%{python3_pkgversion}-libvirt +Requires: python%{python3_pkgversion}-libxml2 +%else Requires: libvirt-python Requires: libxml2-python +%endif Requires: /usr/bin/virt-clone Requires: qemu-img @@ -345,8 +349,12 @@ virtual machine. This package is not required for most installations. Summary: Koji Utilities Group: Applications/Internet License: LGPLv2 +Requires: %{name} = %{version}-%{release} +%if 0%{py3_support} > 1 +Requires: python%{python3_pkgversion}-psycopg2 +%else Requires: python-psycopg2 -Requires: python2-%{name} = %{version}-%{release} +%endif %if %{use_systemd} Requires(post): systemd Requires(preun): systemd