From 4ef7198fa3502f2901c64cfda753c85029f364c70a5f183caa6168c7457b36fc Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Tue, 10 Nov 2020 13:40:14 +0000 Subject: [PATCH] Accepting request 846882 from home:mcepl:branches:security:SELinux Resubmit the update. OBS-URL: https://build.opensuse.org/request/show/846882 OBS-URL: https://build.opensuse.org/package/show/security:SELinux/setools?expand=0&rev=79 --- setools.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/setools.spec b/setools.spec index 892d9e4..5f22398 100644 --- a/setools.spec +++ b/setools.spec @@ -16,16 +16,14 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} # As soon as python38 is introduced as flavor, we need this: %{?!python3_primary_provider:%define python3_primary_provider %{lua: \ l,c = posix.readlink("/usr/bin/python3") \ flavor = l:gsub("%.", ""):sub(0,-1) \ print(rpm.expand("%{?" .. flavor .. "_prefix}%{!?" .. flavor .. "_prefix:python3}")) \ }} - -# doesn't work for python 2 -%define skip_python2 1 +# Skip every flavor except for the primary_provider +%define pythons %python3_primary_provider Name: setools Version: 4.3.0 @@ -107,16 +105,16 @@ This package includes the following graphical tools: %setup -q -n %{name} %build -%{expand:%%%{python3_primary_provider}_build} +%python_build %install -%{expand:%%%{python3_primary_provider}_install} -%fdupes -s %{buildroot}%{expand:%%%{python3_primary_provider}_sitearch} +%python_install +%fdupes -s %{buildroot}%{python3_sitearch} %files -n %{python3_primary_provider}-setools %defattr(-,root,root,-) -%{expand:%%%{python3_primary_provider}_sitearch}/setools -%{expand:%%%{python3_primary_provider}_sitearch}/setools-%{version}*-info +%{python3_sitearch}/setools +%{python3_sitearch}/setools-%{version}*-info %files console %defattr(-,root,root,-) @@ -139,7 +137,7 @@ This package includes the following graphical tools: %files gui %defattr(-,root,root,-) -%{expand:%%%{python3_primary_provider}_sitearch}/setoolsgui +%{python3_sitearch}/setoolsgui %{_bindir}/apol %{_mandir}/man1/apol.1.gz