diff --git a/spacewalk-oscap.spec b/spacewalk-oscap.spec index b51ffa8476..e2fda374ae 100644 --- a/spacewalk-oscap.spec +++ b/spacewalk-oscap.spec @@ -3,11 +3,15 @@ %global default_py3 1 %endif +%if ( 0%{?fedora} && 0%{?fedora} < 28 ) || ( 0%{?rhel} && 0%{?rhel} < 8 ) +%global build_py2 1 +%endif + %define pythonX %{?default_py3: python3}%{!?default_py3: python2} Name: spacewalk-oscap Version: 2.8.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenSCAP plug-in for rhn-check License: GPLv2 @@ -27,6 +31,7 @@ Requires: %{pythonX}-%{name} = %{version}-%{release} spacewalk-oscap is a plug-in for rhn-check. With this plugin, user is able to run OpenSCAP scan from Spacewalk or Red Hat Satellite server. +%if 0%{?build_py2} %package -n python2-%{name} Summary: OpenSCAP plug-in for rhn-check %{?python_provide:%python_provide python2-%{name}} @@ -37,6 +42,7 @@ BuildRequires: python-devel BuildRequires: rhnlib >= 2.8.3 %description -n python2-%{name} Python 2 specific files for %{name}. +%endif %if 0%{?build_py3} %package -n python3-%{name} @@ -60,7 +66,9 @@ make -f Makefile.spacewalk-oscap %install +%if 0%{?build_py2} make -f Makefile.spacewalk-oscap install PREFIX=$RPM_BUILD_ROOT PYTHONPATH=%{python_sitelib} +%endif %if 0%{?build_py3} make -f Makefile.spacewalk-oscap install PREFIX=$RPM_BUILD_ROOT PYTHONPATH=%{python3_sitelib} %endif @@ -86,11 +94,13 @@ make -f Makefile.spacewalk-oscap install PREFIX=$RPM_BUILD_ROOT PYTHONPATH=%{pyt %dir %{_datadir}/openscap/xsl %endif +%if 0%{?build_py2} %files -n python2-%{name} %{python_sitelib}/rhn/actions/scap.* %if 0%{?suse_version} %dir %{python_sitelib}/rhn/actions %endif +%endif %if 0%{?build_py3} %files -n python3-%{name} @@ -103,6 +113,10 @@ make -f Makefile.spacewalk-oscap install PREFIX=$RPM_BUILD_ROOT PYTHONPATH=%{pyt %endif %changelog +* Tue Mar 20 2018 Tomas Kasparek 2.8.5-2 +- don't build python2 subpackages on systems with default python3 + (tkasparek@redhat.com) + * Fri Feb 09 2018 Michael Mraka 2.8.5-1 - remove install/clean section initial cleanup - removed Group from specfile