From 9d1cdadc55ebaf23c5383dcaeff819466382884b Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 26 Jul 2018 13:29:11 -0400 Subject: [PATCH] Do not disable python2 builds by default. There are still some packages that have not been updated to python3 and require python2-pyparted. --- pyparted.spec | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pyparted.spec b/pyparted.spec index 2487df5..c5ffc3a 100644 --- a/pyparted.spec +++ b/pyparted.spec @@ -22,12 +22,21 @@ %bcond_without python3 %endif -%if %{fedora} > 28 -# disable python2 by default -%bcond_with python2 -%else +# XXX: uncomment this when things that use python2-pyparted can use +# the python3 version. Be sure to change '28' to the appropriate +# version number. Also, replace all the '@' signs with '%' because +# I cannot remember this macro construct, I'm just commenting it out. +# --dcantrell +#@if @{fedora} > 28 +## disable python2 by default +#@bcond_with python2 +#@else +#@bcond_without python2 +#@endif + +# XXX: And delete this when you can disable python2 by default. --dcantrell %bcond_without python2 -%endif + %endif %global py2dir python2-build @@ -36,7 +45,7 @@ Summary: Python module for GNU parted Name: pyparted Epoch: 1 Version: 3.11.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: https://github.com/rhinstaller/pyparted @@ -146,6 +155,10 @@ popd %endif %changelog +* Thu Jul 26 2018 David Cantrell - 1:3.11.0-15 +- Do not disable python2 builds by default. There are still some packages + that have not been updated to python3 and require python2-pyparted. + * Wed Jul 25 2018 David Cantrell - 1:3.11.0-14 - Conditionalize python2 and python3 builds to make the SRPM more portable across releases. On RHEL > 7 and Fedora > 28, do not build for python2.